diff --git a/src/ai/default/engine_cpp.hpp b/src/ai/default/engine_cpp.hpp
index 4e75a5b14ff0..ee4eed8c476c 100644
--- a/src/ai/default/engine_cpp.hpp
+++ b/src/ai/default/engine_cpp.hpp
@@ -20,7 +20,7 @@
 #ifndef AI_COMPOSITE_ENGINE_DEFAULT_HPP_INCLUDED
 #define AI_COMPOSITE_ENGINE_DEFAULT_HPP_INCLUDED
 
-#include "engine.hpp"
+#include "ai/composite/engine.hpp"
 
 //============================================================================
 namespace ai {
diff --git a/src/ai/formula/engine_fai.cpp b/src/ai/formula/engine_fai.cpp
index 692d10e2e7d7..1fcc547ec6de 100644
--- a/src/ai/formula/engine_fai.cpp
+++ b/src/ai/formula/engine_fai.cpp
@@ -19,7 +19,7 @@
 
 #include "ai.hpp"
 #include "engine_fai.hpp"
-#include "rca.hpp"
+#include "ai/composite/rca.hpp"
 #include "ai/formula/ai.hpp"
 #include "ai/formula/candidates.hpp"
 #include "ai/formula/stage_side_formulas.hpp"
diff --git a/src/ai/formula/engine_fai.hpp b/src/ai/formula/engine_fai.hpp
index ebeca0da920e..864bcae5e4f2 100644
--- a/src/ai/formula/engine_fai.hpp
+++ b/src/ai/formula/engine_fai.hpp
@@ -20,8 +20,8 @@
 #ifndef AI_COMPOSITE_ENGINE_FAI_HPP_INCLUDED
 #define AI_COMPOSITE_ENGINE_FAI_HPP_INCLUDED
 
-#include "engine.hpp"
-#include "contexts.hpp"
+#include "ai/composite/engine.hpp"
+#include "ai/default/contexts.hpp"
 
 //============================================================================
 namespace ai {
diff --git a/src/ai/lua/engine_lua.cpp b/src/ai/lua/engine_lua.cpp
index 807b972c7af4..0e8237835f0a 100644
--- a/src/ai/lua/engine_lua.cpp
+++ b/src/ai/lua/engine_lua.cpp
@@ -17,12 +17,12 @@
  * @file
  */
 
-#include "ai.hpp"
+#include "ai/formula/ai.hpp"
 #include "engine_lua.hpp"
-#include "goal.hpp"
-#include "rca.hpp"
-#include "stage.hpp"
-#include "aspect.hpp"
+#include "ai/composite/goal.hpp"
+#include "ai/composite/rca.hpp"
+#include "ai/composite/stage.hpp"
+#include "ai/composite/aspect.hpp"
 
 #include "ai/gamestate_observer.hpp"
 
diff --git a/src/ai/lua/engine_lua.hpp b/src/ai/lua/engine_lua.hpp
index 9e8ada70c0c6..40c6dd5fe6ea 100644
--- a/src/ai/lua/engine_lua.hpp
+++ b/src/ai/lua/engine_lua.hpp
@@ -20,7 +20,7 @@
 #ifndef AI_COMPOSITE_ENGINE_LUA_HPP_INCLUDED
 #define AI_COMPOSITE_ENGINE_LUA_HPP_INCLUDED
 
-#include "engine.hpp"
+#include "ai/composite/engine.hpp"
 
 //============================================================================
 namespace ai {