diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index 7b78acdb..5a89c5aa 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -3,6 +3,8 @@
 
 // clang-format off
 #include "mxpresenterlist.h"
+#include "legoentitylist.h"
+#include "legocachesoundlist.h"
 // clang-format on
 
 #include "legoentity.h"
@@ -10,9 +12,7 @@
 #include "legopathcontrollerlist.h"
 #include "roi/legoroi.h"
 
-class LegoCacheSoundList;
 class LegoCameraController;
-class LegoEntityList;
 class LegoPathBoundary;
 class LegoHideAnimPresenter;
 
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index cee950a1..658dc5fa 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -1,14 +1,9 @@
 #include "legoworld.h"
 
-// clang-format off
-#include "legoentitylist.h"
-// clang-format on
-
 #include "anim/legoanim.h"
 #include "legoanimationmanager.h"
 #include "legoanimpresenter.h"
 #include "legobuildingmanager.h"
-#include "legocachesoundlist.h"
 #include "legocachesoundmanager.h"
 #include "legocameracontroller.h"
 #include "legocontrolmanager.h"