diff --git a/input/zmq_input.cpp b/input/zmq_input.cpp
index 62fb41ee..5897a3f4 100644
--- a/input/zmq_input.cpp
+++ b/input/zmq_input.cpp
@@ -4,7 +4,7 @@
 #include "utilities/Logs.h"
 #include "simulation/simulation.h"
 #include "simulation/simulationtime.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 zmq_input::zmq_input()
 {
diff --git a/vehicle/train/Train.cpp b/vehicle/train/Train.cpp
index 942a2fbe..c5dfc971 100644
--- a/vehicle/train/Train.cpp
+++ b/vehicle/train/Train.cpp
@@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "utilities/Globals.h"
 #include "simulation/simulation.h"
diff --git a/vehicle/train/TrainCommandsAuxiliary.cpp b/vehicle/train/TrainCommandsAuxiliary.cpp
index 551a8977..b609c3dc 100644
--- a/vehicle/train/TrainCommandsAuxiliary.cpp
+++ b/vehicle/train/TrainCommandsAuxiliary.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "world/Event.h"
 #include "simulation/simulationtime.h"
diff --git a/vehicle/train/TrainCommandsBrakes.cpp b/vehicle/train/TrainCommandsBrakes.cpp
index c295d88a..c2178322 100644
--- a/vehicle/train/TrainCommandsBrakes.cpp
+++ b/vehicle/train/TrainCommandsBrakes.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "utilities/Globals.h"
 #include "world/Event.h"
diff --git a/vehicle/train/TrainCommandsControls.cpp b/vehicle/train/TrainCommandsControls.cpp
index 0424bad9..417d36f6 100644
--- a/vehicle/train/TrainCommandsControls.cpp
+++ b/vehicle/train/TrainCommandsControls.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "world/Event.h"
 #include "simulation/simulationtime.h"
diff --git a/vehicle/train/TrainCommandsDoors.cpp b/vehicle/train/TrainCommandsDoors.cpp
index 029194dd..3923cc85 100644
--- a/vehicle/train/TrainCommandsDoors.cpp
+++ b/vehicle/train/TrainCommandsDoors.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "simulation/simulation.h"
 #include "world/Event.h"
diff --git a/vehicle/train/TrainCommandsElectrical.cpp b/vehicle/train/TrainCommandsElectrical.cpp
index 5ca2edbb..1ef3c668 100644
--- a/vehicle/train/TrainCommandsElectrical.cpp
+++ b/vehicle/train/TrainCommandsElectrical.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "world/Event.h"
 #include "simulation/simulationtime.h"
diff --git a/vehicle/train/TrainCommandsLights.cpp b/vehicle/train/TrainCommandsLights.cpp
index e4cc64e8..7993ab87 100644
--- a/vehicle/train/TrainCommandsLights.cpp
+++ b/vehicle/train/TrainCommandsLights.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "simulation/simulation.h"
 #include "world/Event.h"
diff --git a/vehicle/train/TrainCommandsMisc.cpp b/vehicle/train/TrainCommandsMisc.cpp
index eb4f096a..a5bfa528 100644
--- a/vehicle/train/TrainCommandsMisc.cpp
+++ b/vehicle/train/TrainCommandsMisc.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "world/Event.h"
 #include "simulation/simulationtime.h"
diff --git a/vehicle/train/TrainCommandsRadio.cpp b/vehicle/train/TrainCommandsRadio.cpp
index 0c10fa70..f4d79b5a 100644
--- a/vehicle/train/TrainCommandsRadio.cpp
+++ b/vehicle/train/TrainCommandsRadio.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "vehicle/Train.h"
+#include "vehicle/train/Train.h"
 
 #include "simulation/simulation.h"
 #include "world/Event.h"