diff --git a/src/farchive.cpp b/src/farchive.cpp
index 42e1105fc..9c128e0f7 100644
--- a/src/farchive.cpp
+++ b/src/farchive.cpp
@@ -55,7 +55,6 @@
 #include "c_dispatch.h"
 #include "d_player.h"
 #include "dobject.h"
-#include "r_local.h"
 
 // These are special tokens found in the data stream of an archive.
 // Whenever a new object is encountered, it gets created using new and
diff --git a/src/fragglescript/t_script.cpp b/src/fragglescript/t_script.cpp
index 88749ba29..09c65d073 100644
--- a/src/fragglescript/t_script.cpp
+++ b/src/fragglescript/t_script.cpp
@@ -45,7 +45,6 @@
 //
 //
 
-#include "r_local.h"
 #include "t_script.h"
 #include "p_lnspec.h"
 #include "a_keys.h"
diff --git a/src/g_shared/sbarinfo.cpp b/src/g_shared/sbarinfo.cpp
index 60956a80b..315d42592 100644
--- a/src/g_shared/sbarinfo.cpp
+++ b/src/g_shared/sbarinfo.cpp
@@ -43,7 +43,6 @@
 #include "m_random.h"
 #include "d_player.h"
 #include "st_stuff.h"
-#include "r_local.h"
 #include "m_swap.h"
 #include "a_keys.h"
 #include "templates.h"
diff --git a/src/g_strife/strife_sbar.cpp b/src/g_strife/strife_sbar.cpp
index a7155b679..3db2274f1 100644
--- a/src/g_strife/strife_sbar.cpp
+++ b/src/g_strife/strife_sbar.cpp
@@ -8,7 +8,7 @@
 #include "m_random.h"
 #include "d_player.h"
 #include "st_stuff.h"
-#include "r_local.h"
+#include "r_utility.h"
 #include "m_swap.h"
 #include "templates.h"
 #include "a_keys.h"
diff --git a/src/p_local.h b/src/p_local.h
index 4249442d0..bc357c68a 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -29,9 +29,6 @@
 #include "r_state.h"
 #include "r_utility.h"
 #include "d_player.h"
-#ifndef __R_LOCAL__
-//#include "r_local.h"
-#endif
 
 #include "a_morph.h"
 
diff --git a/src/p_spec.cpp b/src/p_spec.cpp
index bb516fb44..d73575bea 100644
--- a/src/p_spec.cpp
+++ b/src/p_spec.cpp
@@ -44,7 +44,6 @@
 #include "m_bbox.h"
 #include "w_wad.h"
 
-#include "r_local.h"
 #include "p_local.h"
 #include "p_lnspec.h"
 #include "p_terrain.h"
diff --git a/src/po_man.cpp b/src/po_man.cpp
index da1e12757..b27021810 100644
--- a/src/po_man.cpp
+++ b/src/po_man.cpp
@@ -14,7 +14,6 @@
 
 #include "doomdef.h"
 #include "p_local.h"
-#include "r_local.h"
 #include "i_system.h"
 #include "w_wad.h"
 #include "m_swap.h"
diff --git a/src/r_data/colormaps.cpp b/src/r_data/colormaps.cpp
index 50cf5ced9..7ab9bb176 100644
--- a/src/r_data/colormaps.cpp
+++ b/src/r_data/colormaps.cpp
@@ -40,7 +40,6 @@
 #include "i_system.h"
 #include "w_wad.h"
 #include "doomdef.h"
-#include "r_local.h"
 #include "r_sky.h"
 #include "c_dispatch.h"
 #include "sc_man.h"
@@ -51,6 +50,8 @@
 #include "colormatcher.h"
 #include "colormaps.h"
 #include "v_video.h"
+#include "templates.h"
+#include "r_utility.h"
 
 static bool R_CheckForFixedLights(const BYTE *colormaps);
 
diff --git a/src/r_data/voxels.cpp b/src/r_data/voxels.cpp
index d5a1cca6f..bbfe706e8 100644
--- a/src/r_data/voxels.cpp
+++ b/src/r_data/voxels.cpp
@@ -42,7 +42,6 @@
 #include "m_argv.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "r_local.h"
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -61,6 +60,7 @@
 #include "v_palette.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
+#include "r_data/sprites.h"
 #include "voxels.h"
 
 void VOX_AddVoxel(int sprnum, int frame, FVoxelDef *def);
diff --git a/src/textures/animations.cpp b/src/textures/animations.cpp
index efd813519..c843b1270 100644
--- a/src/textures/animations.cpp
+++ b/src/textures/animations.cpp
@@ -35,7 +35,6 @@
 #include "doomtype.h"
 #include "cmdlib.h"
 #include "i_system.h"
-#include "r_local.h"
 #include "r_sky.h"
 #include "m_random.h"
 #include "d_player.h"
diff --git a/src/textures/buildtexture.cpp b/src/textures/buildtexture.cpp
index 0b3db702a..e534ca9c8 100644
--- a/src/textures/buildtexture.cpp
+++ b/src/textures/buildtexture.cpp
@@ -35,12 +35,12 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "cmdlib.h"
 #include "st_start.h"
 #include "textures/textures.h"
+#include "r_data/sprites.h"
 
 //==========================================================================
 //
diff --git a/src/textures/ddstexture.cpp b/src/textures/ddstexture.cpp
index 437fb28d5..83df4292d 100644
--- a/src/textures/ddstexture.cpp
+++ b/src/textures/ddstexture.cpp
@@ -50,7 +50,6 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "bitmap.h"
diff --git a/src/textures/pcxtexture.cpp b/src/textures/pcxtexture.cpp
index cc2b3a226..3de4174a3 100644
--- a/src/textures/pcxtexture.cpp
+++ b/src/textures/pcxtexture.cpp
@@ -36,7 +36,6 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "bitmap.h"
diff --git a/src/textures/pngtexture.cpp b/src/textures/pngtexture.cpp
index 54a0a0cd9..7927c0a93 100644
--- a/src/textures/pngtexture.cpp
+++ b/src/textures/pngtexture.cpp
@@ -35,7 +35,6 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "m_png.h"
diff --git a/src/textures/tgatexture.cpp b/src/textures/tgatexture.cpp
index d44cf5e1b..374861699 100644
--- a/src/textures/tgatexture.cpp
+++ b/src/textures/tgatexture.cpp
@@ -35,7 +35,6 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "bitmap.h"
diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp
index f0dbc5d81..5e3955cc4 100644
--- a/src/wi_stuff.cpp
+++ b/src/wi_stuff.cpp
@@ -32,7 +32,6 @@
 #include "w_wad.h"
 #include "g_game.h"
 #include "g_level.h"
-#include "r_local.h"
 #include "s_sound.h"
 #include "doomstat.h"
 #include "v_video.h"
@@ -45,6 +44,9 @@
 #include "sc_man.h"
 #include "v_text.h"
 #include "gi.h"
+#include "d_player.h"
+#include "b_bot.h"
+#include "textures/textures.h"
 #include "r_data/r_translate.h"
 #include "templates.h"
 #include "gstrings.h"