diff --git a/src/timer/timer_game_calendar.cpp b/src/timer/timer_game_calendar.cpp
index e14d252b2e..dcdabfb021 100644
--- a/src/timer/timer_game_calendar.cpp
+++ b/src/timer/timer_game_calendar.cpp
@@ -10,14 +10,14 @@
  * This file implements the timer logic for the game-calendar-timer.
  */
 
-#include "stdafx.h"
-#include "openttd.h"
+#include "../stdafx.h"
+#include "../openttd.h"
 #include "timer.h"
 #include "timer_game_calendar.h"
-#include "vehicle_base.h"
-#include "linkgraph/linkgraph.h"
+#include "../vehicle_base.h"
+#include "../linkgraph/linkgraph.h"
 
-#include "safeguards.h"
+#include "../safeguards.h"
 
 TimerGameCalendar::Year TimerGameCalendar::year = {};
 TimerGameCalendar::Month TimerGameCalendar::month = {};
diff --git a/src/timer/timer_game_calendar.h b/src/timer/timer_game_calendar.h
index d28190d356..22a7d91dcc 100644
--- a/src/timer/timer_game_calendar.h
+++ b/src/timer/timer_game_calendar.h
@@ -10,7 +10,7 @@
 #ifndef TIMER_GAME_CALENDAR_H
 #define TIMER_GAME_CALENDAR_H
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "../core/strong_typedef_type.hpp"
 
 /**
diff --git a/src/timer/timer_game_realtime.cpp b/src/timer/timer_game_realtime.cpp
index f3aa7dac1d..62b10f9b05 100644
--- a/src/timer/timer_game_realtime.cpp
+++ b/src/timer/timer_game_realtime.cpp
@@ -10,12 +10,12 @@
  * This file implements the timer logic for the real time game-timer.
  */
 
-#include "stdafx.h"
-#include "openttd.h"
+#include "../stdafx.h"
+#include "../openttd.h"
 #include "timer.h"
 #include "timer_game_realtime.h"
 
-#include "safeguards.h"
+#include "../safeguards.h"
 
 template<>
 void IntervalTimer<TimerGameRealtime>::Elapsed(TimerGameRealtime::TElapsed delta)
diff --git a/src/timer/timer_game_tick.cpp b/src/timer/timer_game_tick.cpp
index ec68a0d8bb..bc7f042f88 100644
--- a/src/timer/timer_game_tick.cpp
+++ b/src/timer/timer_game_tick.cpp
@@ -10,11 +10,11 @@
  * This file implements the timer logic for the tick-based game-timer.
  */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "timer.h"
 #include "timer_game_tick.h"
 
-#include "safeguards.h"
+#include "../safeguards.h"
 
 uint64_t TimerGameTick::counter = 0;
 
diff --git a/src/timer/timer_game_tick.h b/src/timer/timer_game_tick.h
index 96e1da2481..f1a4bf46c6 100644
--- a/src/timer/timer_game_tick.h
+++ b/src/timer/timer_game_tick.h
@@ -10,7 +10,7 @@
 #ifndef TIMER_GAME_TICK_H
 #define TIMER_GAME_TICK_H
 
-#include "gfx_type.h"
+#include "../gfx_type.h"
 
 #include <chrono>
 
diff --git a/src/timer/timer_manager.h b/src/timer/timer_manager.h
index 56af0bdee8..8d62675988 100644
--- a/src/timer/timer_manager.h
+++ b/src/timer/timer_manager.h
@@ -11,7 +11,7 @@
 #ifndef TIMER_MANAGER_H
 #define TIMER_MANAGER_H
 
-#include "stdafx.h"
+#include "../stdafx.h"
 
 template <typename TTimerType>
 class BaseTimer;
diff --git a/src/timer/timer_window.cpp b/src/timer/timer_window.cpp
index dc6938af1b..bc6a10530d 100644
--- a/src/timer/timer_window.cpp
+++ b/src/timer/timer_window.cpp
@@ -10,11 +10,11 @@
  * This file implements the timer logic for the Window system.
  */
 
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "timer.h"
 #include "timer_window.h"
 
-#include "safeguards.h"
+#include "../safeguards.h"
 
 template<>
 void IntervalTimer<TimerWindow>::Elapsed(TimerWindow::TElapsed delta)