6 files changed, 34 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4432d86e9..c7e8c78c7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1028,6 +1028,7 @@ SET(SRCS
     const/equipment.h
     const/spells.h
     const/utils/timer.h
+    const/utils/utf8.h
     const/gui/chat.h
     const/gui/pages.h
     const/gui/theme.h
diff --git a/src/Makefile.am b/src/Makefile.am
index d3c664606..76db75c8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -582,6 +582,7 @@ SRC += events/actionevent.h \
 	      const/equipment.h \
 	      const/spells.h \
 	      const/utils/timer.h \
+	      const/utils/utf8.h \
 	      const/gui/chat.h \
 	      const/gui/theme.h \
 	      const/render/graphics.h \
diff --git a/src/const/utils/utf8.h b/src/const/utils/utf8.h
new file mode 100644
index 000000000..d7042f958
--- /dev/null
+++ b/src/const/utils/utf8.h
@@ -0,0 +1,28 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2017  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CONST_UTILS_UTF8_H
+#define CONST_UTILS_UTF8_H
+
+#include "localconsts.h"
+
+static const size_t UTF8_MAX_SIZE = 10;
+
+#endif  // CONST_UTILS_UTF8_H
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 7671961bc..bb7f7efb5 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -22,6 +22,8 @@
 
 #include "utils/stringutils.h"
 
+#include "const/utils/utf8.h"
+
 #ifndef DYECMD
 #include "resources/iteminfo.h"
 
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 8053be689..f9d7494aa 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -30,8 +30,6 @@
 
 #include "localconsts.h"
 
-static const size_t UTF8_MAX_SIZE = 10;
-
 /**
  * Trims spaces off the end and the beginning of the given string.
  *
diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc
index c90dd1afd..998c5831b 100644
--- a/src/utils/stringutils_unittest.cc
+++ b/src/utils/stringutils_unittest.cc
@@ -22,6 +22,8 @@
 #include "configuration.h"
 #include "logger.h"
 
+#include "const/utils/utf8.h"
+
 #include "utils/physfstools.h"
 
 #include "resources/iteminfo.h"