diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index f92024a5d6..b47a6d5219 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -23,7 +23,7 @@
 #include "genworld.h"
 #include "network/network.h"
 #include "strings_func.h"
-#include "viewport.h"
+#include "viewport_func.h"
 #include "window_func.h"
 #include "functions.h"
 #include "map_func.h"
diff --git a/src/dummy_land.cpp b/src/dummy_land.cpp
index fe605b90c9..1d4491f169 100644
--- a/src/dummy_land.cpp
+++ b/src/dummy_land.cpp
@@ -8,7 +8,7 @@
 #include "tile_cmd.h"
 #include "command_func.h"
 #include "table/sprites.h"
-#include "viewport.h"
+#include "viewport_func.h"
 
 static void DrawTile_Dummy(TileInfo *ti)
 {
diff --git a/src/engine.cpp b/src/engine.cpp
index 102b64316c..e034994ce3 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -19,7 +19,7 @@
 #include "group.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
-#include "viewport.h"
+#include "gfx_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
diff --git a/src/genworld.cpp b/src/genworld.cpp
index 67aec8187a..15c3f961bd 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -17,7 +17,8 @@
 #include "debug.h"
 #include "settings_func.h"
 #include "heightmap.h"
-#include "viewport.h"
+#include "viewport_func.h"
+#include "gfx_func.h"
 #include "map_func.h"
 #include "date_func.h"
 #include "core/random_func.hpp"
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index e52e41d664..7f4fd40b9b 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -11,7 +11,7 @@
 #include "table/sprites.h"
 #include "train.h"
 #include "landscape.h"
-#include "viewport.h"
+#include "viewport_func.h"
 #include "command_func.h"
 #include "industry.h"
 #include "town.h"
diff --git a/src/landscape.cpp b/src/landscape.cpp
index 2f38a6e0ae..8c1a837112 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -9,7 +9,7 @@
 #include "spritecache.h"
 #include "table/sprites.h"
 #include <stdarg.h>
-#include "viewport.h"
+#include "viewport_func.h"
 #include "command_func.h"
 #include "landscape.h"
 #include "variables.h"
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index 917e851780..d54ed925f8 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -6,7 +6,7 @@
 #include "openttd.h"
 #include "variables.h"
 #include "debug.h"
-#include "viewport.h"
+#include "viewport_func.h"
 #include "landscape.h"
 #include "town.h"
 #include "town_map.h"
diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp
index 9ebae2fcf0..a26d7167f8 100644
--- a/src/newgrf_industrytiles.cpp
+++ b/src/newgrf_industrytiles.cpp
@@ -6,7 +6,7 @@
 #include "openttd.h"
 #include "variables.h"
 #include "debug.h"
-#include "viewport.h"
+#include "viewport_func.h"
 #include "landscape.h"
 #include "newgrf.h"
 #include "industry.h"
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index 2ee41caab7..c20512d6ce 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -5,7 +5,8 @@
 #include "debug.h"
 #include "table/strings.h"
 #include "fileio.h"
-#include "viewport.h"
+#include "viewport_func.h"
+#include "gfx_func.h"
 #include "player.h"
 #include "screenshot.h"
 #include "variables.h"
diff --git a/src/signs.cpp b/src/signs.cpp
index 0e7d200dcf..7ae5d631f6 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -13,7 +13,7 @@
 #include "variables.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
-#include "viewport.h"
+#include "viewport_func.h"
 #include "zoom_func.h"
 #include "functions.h"
 #include "window_func.h"
diff --git a/src/station.cpp b/src/station.cpp
index af16d69601..2a04a88c6e 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -10,7 +10,6 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "station.h"
-#include "viewport.h"
 #include "town.h"
 #include "news.h"
 #include "saveload.h"
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 72ca2ce60d..254b1f431e 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -14,7 +14,7 @@
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "station.h"
-#include "viewport.h"
+#include "viewport_func.h"
 #include "command_func.h"
 #include "town.h"
 #include "news.h"
diff --git a/src/texteff.cpp b/src/texteff.cpp
index 9aeefdaceb..67c8949a70 100644
--- a/src/texteff.cpp
+++ b/src/texteff.cpp
@@ -6,7 +6,7 @@
 #include "openttd.h"
 #include "tile_cmd.h"
 #include "landscape.h"
-#include "viewport.h"
+#include "gfx_func.h"
 #include "saveload.h"
 #include "console.h"
 #include "variables.h"
@@ -20,6 +20,7 @@
 #include "core/alloc_func.hpp"
 #include "date_func.h"
 #include "functions.h"
+#include "viewport_func.h"
 
 enum {
 	MAX_TEXTMESSAGE_LENGTH = 200,
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index 5d00f96fce..f1d0b58aa0 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -12,7 +12,7 @@
 #include "tile_cmd.h"
 #include "landscape.h"
 #include "tree_map.h"
-#include "viewport.h"
+#include "viewport_func.h"
 #include "command_func.h"
 #include "economy_func.h"
 #include "town.h"
diff --git a/src/viewport_func.h b/src/viewport_func.h
index 9a8d69125a..dbdd69327b 100644
--- a/src/viewport_func.h
+++ b/src/viewport_func.h
@@ -5,6 +5,7 @@
 #ifndef VIEWPORT_FUNC_H
 #define VIEWPORT_FUNC_H
 
+#include "gfx_type.h"
 #include "viewport_type.h"
 #include "vehicle_type.h"
 
diff --git a/src/viewport_type.h b/src/viewport_type.h
index 4d9f7c75a9..55504ebb69 100644
--- a/src/viewport_type.h
+++ b/src/viewport_type.h
@@ -5,6 +5,7 @@
 #ifndef VIEWPORT_TYPE_H
 #define VIEWPORT_TYPE_H
 
+#include "core/geometry_type.hpp"
 #include "zoom_type.h"
 #include "window_type.h"
 #include "tile_type.h"
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index 2aaecd7c68..72e43631cd 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -21,7 +21,7 @@
 #include "newgrf.h"
 #include "misc/autoptr.hpp"
 #include "strings_func.h"
-#include "viewport.h"
+#include "gfx_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "economy_func.h"