diff --git a/Source/Project64-video/Project64-video.vcxproj b/Source/Project64-video/Project64-video.vcxproj
index 1f7b5d833..323a4b385 100644
--- a/Source/Project64-video/Project64-video.vcxproj
+++ b/Source/Project64-video/Project64-video.vcxproj
@@ -49,6 +49,7 @@
   <ItemGroup>
     <ClInclude Include="F3DTEXA.h" />
     <ClInclude Include="Gfx_1.3.h" />
+    <ClInclude Include="Renderer\glitchmain.h" />
     <ClInclude Include="Renderer\Renderer.h" />
     <ClInclude Include="Renderer\types.h" />
     <ClInclude Include="ScreenResolution.h" />
diff --git a/Source/Project64-video/Project64-video.vcxproj.filters b/Source/Project64-video/Project64-video.vcxproj.filters
index 01797c857..63c0289f3 100644
--- a/Source/Project64-video/Project64-video.vcxproj.filters
+++ b/Source/Project64-video/Project64-video.vcxproj.filters
@@ -163,6 +163,9 @@
     <ClInclude Include="F3DTEXA.h">
       <Filter>ucode</Filter>
     </ClInclude>
+    <ClInclude Include="Renderer\glitchmain.h">
+      <Filter>Renderer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CRC.cpp">
diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp
index 93afaaf43..000479d86 100644
--- a/Source/Project64-video/Renderer/OGLEScombiner.cpp
+++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp
@@ -30,7 +30,8 @@
 
 void vbo_draw();
 
-static int g_alpha_ref, g_alpha_func;
+static gfxCmpFnc_t g_alpha_func;
+static int g_alpha_ref;
 static bool g_alpha_test = 0;
 
 static float g_texture_env_color[4];
@@ -605,7 +606,7 @@ void free_combiners()
     g_shader_programs.clear();
 
     g_alpha_ref = 0;
-    g_alpha_func = 0;
+    g_alpha_func = GFX_CMP_NEVER;
     g_alpha_test = 0;
 
     memset(g_texture_env_color, 0, sizeof(g_texture_env_color));
diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
index 2b1398982..37c604420 100644
--- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp
+++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
@@ -936,7 +936,7 @@ uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params)
         params[0] = 256;
         return 4;
         break;
-    case GFX_FOG_TABLE_ENTRIES:
+    case GR_FOG_TABLE_ENTRIES:
         if (plength < 4 || params == NULL) return 0;
         params[0] = 64;
         return 4;
@@ -953,7 +953,7 @@ uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params)
         params[1] = 65535;
         return 8;
         break;
-    case GFX_LFB_PIXEL_PIPE:
+    case GR_LFB_PIXEL_PIPE:
         if (plength < 4 || params == NULL) return 0;
         params[0] = FXFALSE;
         return 4;
diff --git a/Source/Project64-video/Renderer/glitchmain.h b/Source/Project64-video/Renderer/glitchmain.h
index fe93176b2..0163a5cf7 100644
--- a/Source/Project64-video/Renderer/glitchmain.h
+++ b/Source/Project64-video/Renderer/glitchmain.h
@@ -24,6 +24,7 @@ extern int dumping;
 #endif
 
 #include <Project64-video/trace.h>
+#include "types.h"
 
 #define zscale 1.0f