diff --git a/Makefile b/Makefile
index 37f000af..650ff338 100644
--- a/Makefile
+++ b/Makefile
@@ -2081,10 +2081,10 @@ ifneq ($(USE_RENDERER_DLOPEN), 0)
     $(B)/renderergl1/tr_subs.o
 
   Q3R2OBJ += \
-    $(B)/renderergl1/q_shared.o \
-    $(B)/renderergl1/puff.o \
-    $(B)/renderergl1/q_math.o \
-    $(B)/renderergl1/tr_subs.o
+    $(B)/renderergl2/q_shared.o \
+    $(B)/renderergl2/puff.o \
+    $(B)/renderergl2/q_math.o \
+    $(B)/renderergl2/tr_subs.o
 endif
 
 ifneq ($(USE_INTERNAL_JPEG),0)
@@ -2937,6 +2937,9 @@ $(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl $(STRINGIFY)
 $(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c
 	$(DO_REF_CC)
 
+$(B)/renderergl2/%.o: $(CMDIR)/%.c
+	$(DO_REF_CC)
+
 $(B)/renderergl2/%.o: $(RCOMMONDIR)/%.c
 	$(DO_REF_CC)
 
diff --git a/code/renderergl1/tr_subs.c b/code/renderercommon/tr_subs.c
similarity index 98%
rename from code/renderergl1/tr_subs.c
rename to code/renderercommon/tr_subs.c
index 6f490128..87eb3e0d 100644
--- a/code/renderergl1/tr_subs.c
+++ b/code/renderercommon/tr_subs.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // tr_subs.c - common function replacements for modular renderer
 
-#include "tr_local.h"
+#include "tr_common.h"
 
 void QDECL Com_Printf( const char *msg, ... )
 {
diff --git a/code/renderergl2/tr_subs.c b/code/renderergl2/tr_subs.c
deleted file mode 100644
index 6f490128..00000000
--- a/code/renderergl2/tr_subs.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2010 James Canete (use.less01@gmail.com)
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_subs.c - common function replacements for modular renderer
-
-#include "tr_local.h"
-
-void QDECL Com_Printf( const char *msg, ... )
-{
-	va_list         argptr;
-	char            text[1024];
-
-	va_start(argptr, msg);
-	Q_vsnprintf(text, sizeof(text), msg, argptr);
-	va_end(argptr);
-
-	ri.Printf(PRINT_ALL, "%s", text);
-}
-
-void QDECL Com_Error( int level, const char *error, ... )
-{
-	va_list         argptr;
-	char            text[1024];
-
-	va_start(argptr, error);
-	Q_vsnprintf(text, sizeof(text), error, argptr);
-	va_end(argptr);
-
-	ri.Error(level, "%s", text);
-}