diff --git a/src/swrenderer/drawers/r_draw.cpp b/src/swrenderer/drawers/r_draw.cpp
index cbfb8e253..9d991a039 100644
--- a/src/swrenderer/drawers/r_draw.cpp
+++ b/src/swrenderer/drawers/r_draw.cpp
@@ -38,7 +38,6 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "swrenderer/r_local.h"
 #include "v_video.h"
 #include "doomstat.h"
 #include "st_stuff.h"
@@ -47,11 +46,11 @@
 #include "r_data/r_translate.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
-#include "swrenderer/scene/r_plane.h"
 #include "r_draw.h"
 #include "r_draw_rgba.h"
 #include "r_draw_pal.h"
 #include "r_thread.h"
+#include "swrenderer/r_main.h"
 
 CVAR(Bool, r_dynlights, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 
diff --git a/src/swrenderer/drawers/r_draw_rgba.cpp b/src/swrenderer/drawers/r_draw_rgba.cpp
index 4203bc8a9..90c1ec21a 100644
--- a/src/swrenderer/drawers/r_draw_rgba.cpp
+++ b/src/swrenderer/drawers/r_draw_rgba.cpp
@@ -27,7 +27,7 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
 #include "v_video.h"
 #include "doomstat.h"
 #include "st_stuff.h"
diff --git a/src/swrenderer/drawers/r_thread.cpp b/src/swrenderer/drawers/r_thread.cpp
index 15eeee425..1dea2b356 100644
--- a/src/swrenderer/drawers/r_thread.cpp
+++ b/src/swrenderer/drawers/r_thread.cpp
@@ -25,7 +25,7 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
 #include "v_video.h"
 #include "doomstat.h"
 #include "st_stuff.h"
diff --git a/src/swrenderer/r_local.h b/src/swrenderer/r_local.h
deleted file mode 100644
index 92fb717ab..000000000
--- a/src/swrenderer/r_local.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Emacs style mode select	 -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// $Id:$
-//
-// Copyright (C) 1993-1996 by id Software, Inc.
-//
-// This source is available for distribution and/or modification
-// only under the terms of the DOOM Source Code License as
-// published by id Software. All rights reserved.
-//
-// The source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
-// for more details.
-//
-// DESCRIPTION:
-//		Refresh (R_*) module, global header.
-//		All the rendering/drawing stuff is here.
-//
-//-----------------------------------------------------------------------------
-
-#ifndef __R_LOCAL_H__
-#define __R_LOCAL_H__
-
-// Binary Angles, sine/cosine/atan lookups.
-
-// Screen size related parameters.
-#include "doomdef.h"
-
-// Include the refresh/render data structs.
-
-//
-// Separate header file for each module.
-//
-#include "r_main.h"
-#include "scene/r_things.h"
-#include "drawers/r_draw.h"
-
-#endif // __R_LOCAL_H__
diff --git a/src/swrenderer/r_main.cpp b/src/swrenderer/r_main.cpp
index dbee5ab24..9a874a574 100644
--- a/src/swrenderer/r_main.cpp
+++ b/src/swrenderer/r_main.cpp
@@ -34,7 +34,9 @@
 #include "doomstat.h"
 #include "m_random.h"
 #include "m_bbox.h"
-#include "r_local.h"
+#include "r_main.h"
+#include "scene/r_things.h"
+#include "drawers/r_draw.h"
 #include "scene/r_plane.h"
 #include "scene/r_bsp.h"
 #include "scene/r_segs.h"
diff --git a/src/swrenderer/r_swrenderer.cpp b/src/swrenderer/r_swrenderer.cpp
index 5b0d3b4dd..ea7c54962 100644
--- a/src/swrenderer/r_swrenderer.cpp
+++ b/src/swrenderer/r_swrenderer.cpp
@@ -33,7 +33,8 @@
 */
 
 
-#include "r_local.h"
+#include "r_main.h"
+#include "swrenderer/scene/r_things.h"
 #include "v_palette.h"
 #include "v_video.h"
 #include "m_png.h"
diff --git a/src/swrenderer/scene/r_3dfloors.cpp b/src/swrenderer/scene/r_3dfloors.cpp
index bbd50331c..5cb8f7a8d 100644
--- a/src/swrenderer/scene/r_3dfloors.cpp
+++ b/src/swrenderer/scene/r_3dfloors.cpp
@@ -9,7 +9,7 @@
 #include "doomdef.h"
 #include "p_local.h"
 #include "c_dispatch.h"
-#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
 #include "r_bsp.h"
 #include "r_plane.h"
 #include "c_cvars.h"
diff --git a/src/swrenderer/scene/r_bsp.cpp b/src/swrenderer/scene/r_bsp.cpp
index 36984743b..aa7bc738b 100644
--- a/src/swrenderer/scene/r_bsp.cpp
+++ b/src/swrenderer/scene/r_bsp.cpp
@@ -32,7 +32,6 @@
 #include "p_lnspec.h"
 #include "p_setup.h"
 
-#include "swrenderer/r_local.h"
 #include "swrenderer/r_main.h"
 #include "r_plane.h"
 #include "swrenderer/drawers/r_draw.h"
diff --git a/src/swrenderer/scene/r_plane.cpp b/src/swrenderer/scene/r_plane.cpp
index b6f1eca43..92875f0a3 100644
--- a/src/swrenderer/scene/r_plane.cpp
+++ b/src/swrenderer/scene/r_plane.cpp
@@ -42,7 +42,8 @@
 #include "doomdef.h"
 #include "doomstat.h"
 
-#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
+#include "swrenderer/scene/r_things.h"
 #include "r_sky.h"
 #include "stats.h"
 
diff --git a/src/swrenderer/scene/r_segs.cpp b/src/swrenderer/scene/r_segs.cpp
index 1c90ee2a3..acd69962b 100644
--- a/src/swrenderer/scene/r_segs.cpp
+++ b/src/swrenderer/scene/r_segs.cpp
@@ -30,7 +30,8 @@
 #include "doomdata.h"
 #include "p_lnspec.h"
 
-#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
+#include "swrenderer/scene/r_things.h"
 #include "r_sky.h"
 #include "v_video.h"
 
diff --git a/src/swrenderer/scene/r_things.cpp b/src/swrenderer/scene/r_things.cpp
index 419499d4c..f1c5edca1 100644
--- a/src/swrenderer/scene/r_things.cpp
+++ b/src/swrenderer/scene/r_things.cpp
@@ -37,7 +37,8 @@
 #include "m_swap.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
+#include "swrenderer/scene/r_things.h"
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
diff --git a/src/swrenderer/scene/r_walldraw.cpp b/src/swrenderer/scene/r_walldraw.cpp
index 1b56e9524..097751ef8 100644
--- a/src/swrenderer/scene/r_walldraw.cpp
+++ b/src/swrenderer/scene/r_walldraw.cpp
@@ -27,7 +27,7 @@
 #include "doomstat.h"
 #include "doomdata.h"
 
-#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
 #include "r_sky.h"
 #include "v_video.h"