diff --git a/src/engine/blend.cc b/src/engine/blend.cc
index 291819b..eed4a6d 100644
--- a/src/engine/blend.cc
+++ b/src/engine/blend.cc
@@ -6,6 +6,7 @@
 #include "rendergl.hh" /* has* */
 #include "renderva.hh"
 #include "texture.hh"
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/engine.hh b/src/engine/engine.hh
index f71ea5d..34b4df0 100644
--- a/src/engine/engine.hh
+++ b/src/engine/engine.hh
@@ -2,6 +2,5 @@
 #define __ENGINE_H__
 
 #include "cube.hh"
-#include "world.hh"
 
 #endif
diff --git a/src/engine/light.cc b/src/engine/light.cc
index 54b9330..1589e0b 100644
--- a/src/engine/light.cc
+++ b/src/engine/light.cc
@@ -9,6 +9,7 @@
 #include "physics.hh"
 #include "renderlights.hh"
 #include "texture.hh"
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/material.cc b/src/engine/material.cc
index 39aa94c..57d9a88 100644
--- a/src/engine/material.cc
+++ b/src/engine/material.cc
@@ -6,6 +6,7 @@
 #include "renderva.hh"
 #include "texture.hh"
 #include "water.hh"
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/normal.cc b/src/engine/normal.cc
index 98b34e7..c6bb424 100644
--- a/src/engine/normal.cc
+++ b/src/engine/normal.cc
@@ -2,6 +2,7 @@
 #include "main.hh" // renderprogress
 #include "octarender.hh"
 #include "texture.hh"
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/pvs.cc b/src/engine/pvs.cc
index fce0aae..86ac3ce 100644
--- a/src/engine/pvs.cc
+++ b/src/engine/pvs.cc
@@ -4,6 +4,7 @@
 #include "main.hh" // numcpus, interceptkey, renderbackground
 #include "octa.hh"
 #include "octarender.hh" // valist
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/renderva.cc b/src/engine/renderva.cc
index 281b398..9b5c98f 100644
--- a/src/engine/renderva.cc
+++ b/src/engine/renderva.cc
@@ -13,6 +13,7 @@
 #include "rendermodel.hh"
 #include "rendersky.hh"
 #include "texture.hh"
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/stain.cc b/src/engine/stain.cc
index 42f2264..c43691c 100644
--- a/src/engine/stain.cc
+++ b/src/engine/stain.cc
@@ -1,11 +1,13 @@
+#include "stain.hh"
+
 #include "console.hh" /* conoutf */
 #include "main.hh" // initing, loadprogress
 #include "material.hh"
 #include "rendergl.hh"
 #include "renderlights.hh"
 #include "rendermodel.hh" // loadmapmodel
-#include "stain.hh"
 #include "texture.hh"
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/texture.cc b/src/engine/texture.cc
index 0b06af0..65e69aa 100644
--- a/src/engine/texture.cc
+++ b/src/engine/texture.cc
@@ -12,6 +12,7 @@
 #include "rendergl.hh"
 #include "rendersky.hh"
 #include "shader.hh"
+#include "world.hh"
 
 #include "engine.hh"
 
diff --git a/src/engine/water.cc b/src/engine/water.cc
index 774738b..3d17158 100644
--- a/src/engine/water.cc
+++ b/src/engine/water.cc
@@ -1,8 +1,10 @@
+#include "water.hh"
+
 #include "material.hh"
 #include "octarender.hh"
 #include "rendergl.hh"
 #include "texture.hh"
-#include "water.hh"
+#include "world.hh"
 
 #include "engine.hh"