diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index 43340b768..bcc4a61e8 100644
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // actorenemy.cpp:
 
 #include "actorenemy.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "sentient.h"
 #include "actor.h"
 
diff --git a/code/fgame/entity.h b/code/fgame/entity.h
index 58c6f4521..4a24bb1fa 100644
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
@@ -830,6 +830,6 @@ inline str Entity::GetRandomAlias(str name, AliasListNode_t **ret)
     return realname;
 }
 
-#include "world.h"
+#include "worldspawn.h"
 
 #endif
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 1d853f5a2..226cc959e 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_local.h"
 #include "g_utils.h"
 #include "ctype.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "player.h"
diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp
index 6eaa288af..00030a35c 100644
--- a/code/fgame/game.cpp
+++ b/code/fgame/game.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "game.h"
 #include "scriptmaster.h"
-#include "world.h"
+#include "worldspawn.h"
 
 #include "camera.h"
 #include "entity.h"
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index 648e9586f..5486d8b16 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "entity.h"
 #include "consoleevent.h"
 #include "player.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "weapon.h"
 #include "trigger.h"
 #include "scriptmaster.h"
diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 1544fd3bc..661ff735e 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "game.h"
 #include "g_spawn.h"
 #include "object.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "scriptcompiler.h"
 #include "scriptexception.h"
 
diff --git a/code/fgame/simpleentity.cpp b/code/fgame/simpleentity.cpp
index 854a80240..103475001 100644
--- a/code/fgame/simpleentity.cpp
+++ b/code/fgame/simpleentity.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "glb_local.h"
 #include "simpleentity.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "level.h"
 #include "../script/scriptexception.h"
 
diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index dd483dfac..3f2e9103e 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "trigger.h"
 #include "scriptmaster.h"
 #include "parm.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "barrels.h"
 
 Event EV_Trigger_ActivateTargets
diff --git a/code/fgame/world.cpp b/code/fgame/worldspawn.cpp
similarity index 99%
rename from code/fgame/world.cpp
rename to code/fgame/worldspawn.cpp
index d91ea0f83..ff831e778 100644
--- a/code/fgame/world.cpp
+++ b/code/fgame/worldspawn.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // world.cpp : Holds the target list, and general info (fog and such).
 
 #include "g_phys.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "level.h"
 #include "scriptmaster.h"
 #include "scriptexception.h"
diff --git a/code/fgame/world.h b/code/fgame/worldspawn.h
similarity index 100%
rename from code/fgame/world.h
rename to code/fgame/worldspawn.h
diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index bcf883129..cd4aa3006 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #ifdef WITH_SCRIPT_ENGINE
-#    include "../fgame/world.h"
+#    include "../fgame/worldspawn.h"
 #    include "../fgame/scriptmaster.h"
 #    include "../fgame/simpleentity.h"
 #endif
diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index f2bbbc2a3..afc389480 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../fgame/game.h"
 #include "../fgame/level.h"
 #include "../fgame/parm.h"
-#include "../fgame/world.h"
+#include "../fgame/worldspawn.h"
 
 #include <utility>