diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index dbcab55da4..596a770ab2 100644
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -50,7 +50,6 @@ CGUI
 #include "lib/input.h"
 #include "lib/bits.h"
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "lib/sysdep/sysdep.h"
 // TODO Gee: Whatever include CRect/CPos/CSize
 #include "ps/Overlay.h"
diff --git a/source/lib/path.cpp b/source/lib/path.cpp
index 769cb9b54f..f71430a1cf 100644
--- a/source/lib/path.cpp
+++ b/source/lib/path.cpp
@@ -30,8 +30,6 @@
 #include <cstring>
 #include <cerrno>
 
-#include "lib/utf8.h"
-
 ERROR_ASSOCIATE(ERR::PATH_CHARACTER_ILLEGAL, L"illegal path character", -1);
 ERROR_ASSOCIATE(ERR::PATH_CHARACTER_UNSAFE, L"unsafe path character", -1);
 ERROR_ASSOCIATE(ERR::PATH_NOT_FOUND, L"path not found", -1);
diff --git a/source/lib/secure_crt.cpp b/source/lib/secure_crt.cpp
index f53a63cb17..fc745de4e0 100644
--- a/source/lib/secure_crt.cpp
+++ b/source/lib/secure_crt.cpp
@@ -32,11 +32,6 @@
 
 #include "lib/secure_crt.h"
 
-#ifdef WSECURE_CRT
-#include "lib/utf8.h"
-#endif
-
-
 // we were included from wsecure_crt.cpp; skip all stuff that
 // must only be done once.
 #ifndef WSECURE_CRT
diff --git a/source/lib/sysdep/os/osx/osx.cpp b/source/lib/sysdep/os/osx/osx.cpp
index 83dd554caf..06330d830f 100644
--- a/source/lib/sysdep/os/osx/osx.cpp
+++ b/source/lib/sysdep/os/osx/osx.cpp
@@ -23,7 +23,6 @@
 #include "precompiled.h"
 
 #include "lib/lib.h"
-#include "lib/utf8.h"
 
 #include "lib/sysdep/sysdep.h"
 #include "lib/sysdep/gfx.h"
diff --git a/source/lib/sysdep/tests/test_sysdep.h b/source/lib/sysdep/tests/test_sysdep.h
index bf4a9242c7..b8cbb9936e 100644
--- a/source/lib/sysdep/tests/test_sysdep.h
+++ b/source/lib/sysdep/tests/test_sysdep.h
@@ -24,7 +24,6 @@
 
 #include "lib/lib.h"
 #include "lib/secure_crt.h"
-#include "lib/utf8.h"
 #include "lib/sysdep/cpu.h"
 #include "lib/sysdep/filesystem.h"
 #include "lib/sysdep/sysdep.h"
diff --git a/source/network/NetServer.cpp b/source/network/NetServer.cpp
index 9f786b25a6..cde56ea791 100644
--- a/source/network/NetServer.cpp
+++ b/source/network/NetServer.cpp
@@ -25,7 +25,6 @@
 #include "NetStats.h"
 #include "NetTurnManager.h"
 
-#include "lib/utf8.h"
 #include "lib/external_libraries/enet.h"
 #include "ps/CLogger.h"
 #include "scriptinterface/ScriptInterface.h"
diff --git a/source/ps/GameSetup/Config.cpp b/source/ps/GameSetup/Config.cpp
index 1004101afe..1cde6fd925 100644
--- a/source/ps/GameSetup/Config.cpp
+++ b/source/ps/GameSetup/Config.cpp
@@ -21,7 +21,6 @@
 #include "ps/CConsole.h"
 #include "ps/GameSetup/CmdLineArgs.h"
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "lib/res/sound/snd_mgr.h"
 #include "Config.h"
 
diff --git a/source/ps/Replay.cpp b/source/ps/Replay.cpp
index e19f463532..6f0350292f 100644
--- a/source/ps/Replay.cpp
+++ b/source/ps/Replay.cpp
@@ -21,7 +21,6 @@
 
 #include "graphics/TerrainTextureManager.h"
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "lib/file/file_system.h"
 #include "lib/tex/tex.h"
 #include "ps/Game.h"
diff --git a/source/scripting/ScriptGlue.cpp b/source/scripting/ScriptGlue.cpp
index 51e6595532..98cfbe1d2a 100644
--- a/source/scripting/ScriptGlue.cpp
+++ b/source/scripting/ScriptGlue.cpp
@@ -36,7 +36,6 @@
 #include "lib/frequency_filter.h"
 #include "lib/svn_revision.h"
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "lib/sysdep/sysdep.h"	// sys_OpenFile
 #include "maths/scripting/JSInterface_Vector3D.h"
 #include "network/NetServer.h"
diff --git a/source/scriptinterface/tests/test_ScriptInterface.h b/source/scriptinterface/tests/test_ScriptInterface.h
index e9ff869518..25a7b13a2b 100644
--- a/source/scriptinterface/tests/test_ScriptInterface.h
+++ b/source/scriptinterface/tests/test_ScriptInterface.h
@@ -19,7 +19,6 @@
 
 #include "scriptinterface/ScriptInterface.h"
 
-#include "lib/utf8.h"
 #include "ps/CLogger.h"
 
 #include <boost/random/linear_congruential.hpp>
diff --git a/source/simulation2/Simulation2.cpp b/source/simulation2/Simulation2.cpp
index 09e4b922b3..760b8e9076 100644
--- a/source/simulation2/Simulation2.cpp
+++ b/source/simulation2/Simulation2.cpp
@@ -28,7 +28,6 @@
 #include "simulation2/components/ICmpTemplateManager.h"
 
 #include "lib/timer.h"
-#include "lib/utf8.h"
 #include "lib/file/file_system_util.h"
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
diff --git a/source/simulation2/components/CCmpVisualActor.cpp b/source/simulation2/components/CCmpVisualActor.cpp
index e238403b1b..840a0484bf 100644
--- a/source/simulation2/components/CCmpVisualActor.cpp
+++ b/source/simulation2/components/CCmpVisualActor.cpp
@@ -32,7 +32,6 @@
 #include "graphics/Unit.h"
 #include "graphics/UnitAnimation.h"
 #include "graphics/UnitManager.h"
-#include "lib/utf8.h"
 #include "maths/Matrix3D.h"
 #include "maths/Vector3D.h"
 #include "ps/CLogger.h"