fix some includes

src/game_preferences.cpp

@@ -24,6 +24,7 @@
 #include "map.hpp"
 #include "network.hpp" // ping_timeout
 #include "serialization/string_utils.hpp"
+#include "serialization/unicode_cast.hpp"
 #include "settings.hpp"
 #include "unit.hpp"
 #include "unit_map.hpp"

src/gui/auxiliary/event/dispatcher.hpp

@@ -18,7 +18,7 @@
 #include "gui/auxiliary/event/handler.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "sdl/compat.hpp"
-#include "serialization/unicode.hpp"
+#include "serialization/unicode_types.hpp"
 
 #include "SDL_events.h"
 

src/gui/auxiliary/event/handler.cpp

@@ -25,6 +25,7 @@
 #include "hotkey/hotkey_item.hpp"
 #include "utils/foreach.tpp"
 #include "video.hpp"
+#include "serialization/unicode_cast.hpp"
 
 #include <cassert>
 

src/gui/auxiliary/filter.hpp

@@ -24,6 +24,7 @@
 #include "map_utils.hpp"
 #include "util.hpp"
 #include "serialization/string_utils.hpp"
+#include "serialization/unicode.hpp"
 
 namespace gui2
 {

src/gui/dialogs/chat_log.cpp

@@ -31,6 +31,7 @@
 #include "utils/foreach.tpp"
 
 #include "desktop/clipboard.hpp"
+#include "serialization/unicode.hpp"
 #include "../../game_preferences.hpp"
 #include "../../log.hpp"
 #include "../../resources.hpp"

src/gui/widgets/password_box.cpp

@@ -24,6 +24,7 @@
 #include "gui/widgets/detail/register.tpp"
 #include "gui/widgets/settings.hpp"
 #include "serialization/string_utils.hpp"
+#include "serialization/unicode.hpp"
 
 #include <boost/bind.hpp>
 

src/gui/widgets/text.cpp

@@ -19,6 +19,7 @@
 #include "desktop/clipboard.hpp"
 #include "gui/auxiliary/log.hpp"
 #include "serialization/string_utils.hpp"
+#include "serialization/unicode.hpp"
 
 #include <boost/bind.hpp>
 

src/gui/widgets/text_box.cpp

@@ -25,7 +25,7 @@
 #include "gui/widgets/window.hpp"
 #include "game_preferences.hpp"
 #include "utils/foreach.tpp"
-
+#include "serialization/unicode.hpp"
 #include <boost/bind.hpp>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__

src/marked-up_text.cpp

@@ -26,6 +26,7 @@
 #include "gettext.hpp"
 #include "marked-up_text.hpp"
 #include "serialization/string_utils.hpp"
+#include "serialization/unicode.hpp"
 #include "video.hpp"
 #include "wml_exception.hpp"
 

src/marked-up_text.hpp

@@ -22,7 +22,7 @@ class CVideo;
 struct surface;
 #include <SDL_video.h>
 #include <string>
-#include "serialization/unicode.hpp"
+#include "serialization/unicode_types.hpp"
 
 #ifdef SDL_GPU
 #include "sdl/image.hpp"

src/race.cpp

@@ -23,6 +23,7 @@
 
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
+#include "serialization/unicode_cast.hpp"
 #include "random_new.hpp"
 
 /// Dummy race used when a race is not yet known.

src/race.hpp

@@ -16,7 +16,7 @@
 #define RACE_HPP_INCLUDED
 
 #include "config.hpp"
-#include "serialization/unicode.hpp"
+#include "serialization/unicode_types.hpp"
 
 
 

src/text.cpp

@@ -22,6 +22,7 @@
 #include "gui/lib/types/point.hpp"
 #include "font.hpp"
 #include "serialization/string_utils.hpp"
+#include "serialization/unicode.hpp"
 #include "tstring.hpp"
 
 #include <boost/foreach.hpp>

src/text.hpp

@@ -16,7 +16,7 @@
 #define TEXT_HPP_INCLUDED
 
 #include "sdl/utils.hpp"
-#include "serialization/unicode.hpp"
+#include "serialization/unicode_types.hpp"
 
 #include <boost/noncopyable.hpp>