diff --git a/src/bmp.cpp b/src/bmp.cpp
index dc6d11ef74..0dc5cd8f26 100644
--- a/src/bmp.cpp
+++ b/src/bmp.cpp
@@ -3,7 +3,7 @@
 /** @file bmp.cpp */
 
 #include "stdafx.h"
-#include "openttd.h"
+#include "helpers.hpp"
 #include "bmp.h"
 #include "core/bitmath_func.hpp"
 
diff --git a/src/gui.h b/src/gui.h
index d48e83ee1e..c758f13c29 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -5,7 +5,6 @@
 #ifndef GUI_H
 #define GUI_H
 
-#include "string.h"
 #include "window_type.h"
 #include "vehicle_type.h"
 #include "gfx_type.h"
diff --git a/src/textbuf_gui.h b/src/textbuf_gui.h
index 8dc1c6fc2f..612c4a5d29 100644
--- a/src/textbuf_gui.h
+++ b/src/textbuf_gui.h
@@ -5,6 +5,7 @@
 #ifndef TEXTBUF_GUI_H
 #define TEXTBUF_GUI_H
 
+#include "string.h"
 #include "window_type.h"
 
 struct Textbuf {
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index ccd4c723c2..4e982e94da 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -43,6 +43,7 @@
 #include "transparency.h"
 #include "tunnelbridge_map.h"
 #include "strings_func.h"
+#include "string.h"
 
 
 /* Initialize the town-pool */