diff --git a/source/build/include/build.h b/source/build/include/build.h
index 9c60120e6..8cd606877 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -994,25 +994,5 @@ extern int32_t(*changespritestat_replace)(int16_t spritenum, int16_t newstatnum)
 extern void(*PolymostProcessVoxels_Callback)(void);
 #endif
 
-class F2DDrawer;
-
-extern F2DDrawer twodpsp;
-extern F2DDrawer* twod;
-
-// This is for safely substituting the 2D drawer for a block of code. Won't be needed anymore after proper refactoring.
-class PspTwoDSetter
-{
-	F2DDrawer* old;
-public:
-	PspTwoDSetter()
-	{
-		old = twod;
-		twod = &twodpsp;
-	}
-	~PspTwoDSetter()
-	{
-		twod = old;
-	}
-};
 
 #endif // build_h_
diff --git a/source/core/automap.cpp b/source/core/automap.cpp
index 172e52e65..251ee32df 100644
--- a/source/core/automap.cpp
+++ b/source/core/automap.cpp
@@ -43,6 +43,7 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
 #include "quotemgr.h"
 #include "v_video.h"
 #include "gamestruct.h"
+#include "v_draw.h"
 
 CVAR(Bool, am_followplayer, true, CVAR_ARCHIVE)
 CVAR(Bool, am_rotate, true, CVAR_ARCHIVE)
diff --git a/source/core/mainloop.cpp b/source/core/mainloop.cpp
index ccf52b909..5e56e44b7 100644
--- a/source/core/mainloop.cpp
+++ b/source/core/mainloop.cpp
@@ -87,6 +87,7 @@
 #include "statusbar.h"
 #include "gamestruct.h"
 #include "savegamehelp.h"
+#include "v_draw.h"
 
 CVAR(Bool, vid_activeinbackground, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, r_ticstability, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
diff --git a/source/core/palette.cpp b/source/core/palette.cpp
index 877791747..18a4d0682 100644
--- a/source/core/palette.cpp
+++ b/source/core/palette.cpp
@@ -44,6 +44,7 @@
 #include "v_colortables.h"
 #include "v_font.h"
 #include "printf.h"
+#include "v_draw.h"
 #include "../../glbackend/glbackend.h"
 
 LookupTableInfo lookups;
diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp
index 5585e3a01..14bace9b3 100644
--- a/source/exhumed/src/exhumed.cpp
+++ b/source/exhumed/src/exhumed.cpp
@@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "d_protocol.h"
 #include "texturemanager.h"
 #include "razemenu.h"
+#include "v_draw.h"
 
 BEGIN_PS_NS
 
diff --git a/source/exhumed/src/gun.cpp b/source/exhumed/src/gun.cpp
index f66fd606e..db968a28b 100644
--- a/source/exhumed/src/gun.cpp
+++ b/source/exhumed/src/gun.cpp
@@ -934,8 +934,6 @@ void DrawWeapons(double smooth)
     if (nWeapon < -1) {
         return;
     }
-    PspTwoDSetter set; // this is the last one.
-
     short var_34 = PlayerList[nLocalPlayer].field_3A;
 
     short var_30 = SeqOffsets[WeaponInfo[nWeapon].nSeq];
diff --git a/source/exhumed/src/view.cpp b/source/exhumed/src/view.cpp
index 96b0195ae..0edf0a780 100644
--- a/source/exhumed/src/view.cpp
+++ b/source/exhumed/src/view.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mapinfo.h"
 #include "v_video.h"
 #include "glbackend/glbackend.h"
+#include "v_draw.h"
 #include <string.h>
 
 BEGIN_PS_NS