diff --git a/Source/Project64-video/FBtoScreen.cpp b/Source/Project64-video/FBtoScreen.cpp
index f0cc4fc05..1a310066e 100644
--- a/Source/Project64-video/FBtoScreen.cpp
+++ b/Source/Project64-video/FBtoScreen.cpp
@@ -91,7 +91,7 @@ static int SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaque)
             GR_BLEND_ZERO);
     }
     grDepthBufferFunction(GR_CMP_ALWAYS);
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
     grDepthMask(FXFALSE);
     rdp.update |= UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE;
     return tmu;
@@ -501,7 +501,7 @@ static void DrawHiresDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
         GR_BLEND_ZERO);
     grDepthBufferFunction(GR_CMP_ALWAYS);
     grDepthMask(FXFALSE);
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
     gfxTexCombine(GR_TMU1,
         GR_COMBINE_FUNCTION_NONE,
         GR_COMBINE_FACTOR_NONE,
diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp
index f0157dbf7..d9de10a63 100644
--- a/Source/Project64-video/Main.cpp
+++ b/Source/Project64-video/Main.cpp
@@ -529,7 +529,7 @@ int InitGfx()
     gfxVertexLayout(GR_PARAM_ST1, offsetof(VERTEX, coord[2]), GR_PARAM_ENABLE);
     gfxVertexLayout(GR_PARAM_PARGB, offsetof(VERTEX, b), GR_PARAM_ENABLE);
 
-    grCullMode(GR_CULL_NEGATIVE);
+    gfxCullMode(GR_CULL_NEGATIVE);
 
     if (g_settings->fog()) //"FOGCOORD" extension
     {
@@ -546,7 +546,7 @@ int InitGfx()
     guLoadTextures();
     ClearCache();
 
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
     grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
     grDepthBufferFunction(GR_CMP_ALWAYS);
     grRenderBuffer(GR_BUFFER_BACKBUFFER);
@@ -1320,7 +1320,7 @@ void newSwapBuffers()
     gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y);
     grDepthBufferFunction(GR_CMP_ALWAYS);
     grDepthMask(FXFALSE);
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
 
     if (g_capture_screen)
     {
diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp
index ddcdaf9de..0f2bae665 100644
--- a/Source/Project64-video/Renderer/OGLESgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLESgeometry.cpp
@@ -181,8 +181,7 @@ void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
     }
 }
 
-FX_ENTRY void FX_CALL
-grCullMode(GrCullMode_t mode)
+void gfxCullMode(GrCullMode_t mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
     static int oldmode = -1, oldinv = -1;
diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
index 13c18ba59..92e875bfe 100644
--- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp
+++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
@@ -1214,7 +1214,7 @@ grRenderBuffer(GrBuffer_t buffer)
             //glTranslatef(0, 0, 1-zscale);
             //glScalef(1, 1, zscale);
             inverted_culling = 0;
-            grCullMode(culling_mode);
+            gfxCullMode(culling_mode);
 
             g_width = savedWidth;
             g_height = savedHeight;
@@ -1302,7 +1302,7 @@ grRenderBuffer(GrBuffer_t buffer)
                         glScalef(1, 1*1, zscale);
                         */
                 inverted_culling = 1;
-                grCullMode(culling_mode);
+                gfxCullMode(culling_mode);
             }
         }
         render_to_texture = 1;
diff --git a/Source/Project64-video/Renderer/OGLgeometry.cpp b/Source/Project64-video/Renderer/OGLgeometry.cpp
index 523917d42..6a0f1ce67 100644
--- a/Source/Project64-video/Renderer/OGLgeometry.cpp
+++ b/Source/Project64-video/Renderer/OGLgeometry.cpp
@@ -111,8 +111,7 @@ void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
     }
 }
 
-FX_ENTRY void FX_CALL
-grCullMode(GrCullMode_t mode)
+void gfxCullMode(GrCullMode_t mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
     static int oldmode = -1, oldinv = -1;
@@ -143,7 +142,7 @@ grCullMode(GrCullMode_t mode)
     default:
         WriteTrace(TraceGlitch, TraceWarning, "unknown cull mode : %x", mode);
     }
-    grDisplayGLError("grCullMode");
+    grDisplayGLError("gfxCullMode");
 }
 
 // Depth buffer
diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp
index 0cf6c1a69..28cada6eb 100644
--- a/Source/Project64-video/Renderer/OGLglitchmain.cpp
+++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp
@@ -1497,7 +1497,7 @@ grRenderBuffer(GrBuffer_t buffer)
             glTranslatef(0, 0, 1 - zscale);
             glScalef(1, 1, zscale);
             inverted_culling = 0;
-            grCullMode(culling_mode);
+            gfxCullMode(culling_mode);
 
             g_width = savedWidth;
             g_height = savedHeight;
@@ -1584,7 +1584,7 @@ grRenderBuffer(GrBuffer_t buffer)
                 glTranslatef(0, 0, 1 - zscale);
                 glScalef(1, 1 * 1, zscale);
                 inverted_culling = 1;
-                grCullMode(culling_mode);
+                gfxCullMode(culling_mode);
             }
         }
         render_to_texture = 1;
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index 01bdbce58..af85f8462 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -42,6 +42,8 @@ void gfxTexColorCombineExt(GrChipID_t tmu, GrTCCUColor_t a, GrCombineMode_t a_mo
 void gfxTexAlphaCombineExt(GrChipID_t tmu, GrTACUColor_t a, GrCombineMode_t a_mode, GrTACUColor_t b, GrCombineMode_t b_mode, GrTACUColor_t c, FxBool c_invert, GrTACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
 void gfxConstantColorValueExt(GrChipID_t tmu, GrColor_t value);
 void gfxVertexLayout(FxU32 param, FxI32 offset, FxU32 mode);
+void gfxVertexLayout(GrCullMode_t mode);
+void gfxCullMode(GrCullMode_t mode);
 
 extern uint32_t nbTextureUnits;
 extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;
diff --git a/Source/Project64-video/TexBuffer.cpp b/Source/Project64-video/TexBuffer.cpp
index d7528b2b5..521d8b3f0 100644
--- a/Source/Project64-video/TexBuffer.cpp
+++ b/Source/Project64-video/TexBuffer.cpp
@@ -342,7 +342,7 @@ static GrTextureFormat_t TexBufSetupCombiner(int force_rgb = FALSE)
     gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y);
     grDepthBufferFunction(GR_CMP_ALWAYS);
     grDepthMask(FXFALSE);
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
     gfxFogMode(GR_FOG_DISABLE);
     GrTextureFormat_t buf_format = (rdp.tbuff_tex) ? rdp.tbuff_tex->info.format : GFX_TEXFMT_RGB_565;
     GrCombineFunction_t color_source = GR_COMBINE_FUNCTION_LOCAL;
diff --git a/Source/Project64-video/Util.cpp b/Source/Project64-video/Util.cpp
index f56c78fe5..d61be4e39 100644
--- a/Source/Project64-video/Util.cpp
+++ b/Source/Project64-video/Util.cpp
@@ -1862,15 +1862,15 @@ void update()
         {
         case 0: // cull none
         case 3: // cull both
-            grCullMode(GR_CULL_DISABLE);
+            gfxCullMode(GR_CULL_DISABLE);
             break;
         case 1: // cull front
-            //        grCullMode(GR_CULL_POSITIVE);
-            grCullMode(GR_CULL_NEGATIVE);
+            //        gfxCullMode(GR_CULL_POSITIVE);
+            gfxCullMode(GR_CULL_NEGATIVE);
             break;
         case 2: // cull back
-            //        grCullMode (GR_CULL_NEGATIVE);
-            grCullMode(GR_CULL_POSITIVE);
+            //        gfxCullMode (GR_CULL_NEGATIVE);
+            gfxCullMode(GR_CULL_POSITIVE);
             break;
         }
     }
diff --git a/Source/Project64-video/rdp.cpp b/Source/Project64-video/rdp.cpp
index 3bcdd2a5f..8fda85452 100644
--- a/Source/Project64-video/rdp.cpp
+++ b/Source/Project64-video/rdp.cpp
@@ -2519,7 +2519,7 @@ void rdp_fillrect()
         gfxAlphaTestFunction(GR_CMP_ALWAYS);
         gfxStippleMode(GR_STIPPLE_DISABLE);
 
-        grCullMode(GR_CULL_DISABLE);
+        gfxCullMode(GR_CULL_DISABLE);
         gfxFogMode(GR_FOG_DISABLE);
         grDepthBufferFunction(GR_CMP_ALWAYS);
         grDepthMask(FXFALSE);
@@ -3192,7 +3192,7 @@ void SetWireframeCol()
     }
 
     gfxAlphaTestFunction(GR_CMP_ALWAYS);
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
 
     rdp.update |= UPDATE_COMBINE | UPDATE_ALPHA_COMPARE;
 }
@@ -3963,7 +3963,7 @@ void lle_triangle(uint32_t w1, uint32_t w2, int shade, int texture, int zbuffer,
         apply_shade_mods(v);
     }
     ConvertCoordsConvert(vtxbuf, nbVtxs);
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
     grDrawVertexArrayContiguous(GR_TRIANGLE_STRIP, nbVtxs - 1, vtxbuf, sizeof(VERTEX));
 }
 
diff --git a/Source/Project64-video/ucode05.cpp b/Source/Project64-video/ucode05.cpp
index 3b2d83e92..dac466486 100644
--- a/Source/Project64-video/ucode05.cpp
+++ b/Source/Project64-video/ucode05.cpp
@@ -11,6 +11,7 @@
 * version 2 of the License, or (at your option) any later version.         *
 *                                                                          *
 ****************************************************************************/
+#include <Project64-video/Renderer/Renderer.h>
 #include <Project64-video/rdp.h>
 #include <Project64-video/Gfx_1.3.h>
 #include <Project64-video/trace.h>
@@ -203,17 +204,17 @@ void uc5_tridma()
 
         if (flags & 0x40) { // no cull
             rdp.flags &= ~CULLMASK;
-            grCullMode(GR_CULL_DISABLE);
+            gfxCullMode(GR_CULL_DISABLE);
         }
         else {        // front cull
             rdp.flags &= ~CULLMASK;
             if (rdp.view_scale[0] < 0) {
                 rdp.flags |= CULL_BACK;   // agh, backwards culling
-                grCullMode(GR_CULL_POSITIVE);
+                gfxCullMode(GR_CULL_POSITIVE);
             }
             else {
                 rdp.flags |= CULL_FRONT;
-                grCullMode(GR_CULL_NEGATIVE);
+                gfxCullMode(GR_CULL_NEGATIVE);
             }
         }
         start += 4;
diff --git a/Source/Project64-video/ucode06.cpp b/Source/Project64-video/ucode06.cpp
index d14d1c71c..655e12994 100644
--- a/Source/Project64-video/ucode06.cpp
+++ b/Source/Project64-video/ucode06.cpp
@@ -66,7 +66,7 @@ float set_sprite_combine_mode()
         WriteTrace(TraceRDP, TraceDebug, "z compare not used, using 0");
     }
 
-    grCullMode(GR_CULL_DISABLE);
+    gfxCullMode(GR_CULL_DISABLE);
     gfxFogMode(GR_FOG_DISABLE);
     rdp.update |= UPDATE_CULL_MODE | UPDATE_FOG_ENABLED;