diff --git a/glide2x/sst1/glide/src/gaa.c b/glide2x/sst1/glide/src/gaa.c
index 4a18030..e147386 100644
--- a/glide2x/sst1/glide/src/gaa.c
+++ b/glide2x/sst1/glide/src/gaa.c
@@ -163,7 +163,6 @@ GR_ENTRY(grAADrawPoint, void, ( const GrVertex *e ))
 static void grSetVertexParameter(const GrVertex *v1)
 {
   GR_DCL_GC;
-  GR_DCL_HW;
   struct dataList_s *dlp;
   int i;
   float *fp, dp;
diff --git a/glide2x/sst1/glide/src/gsst.c b/glide2x/sst1/glide/src/gsst.c
index 03f7d12..94ec846 100644
--- a/glide2x/sst1/glide/src/gsst.c
+++ b/glide2x/sst1/glide/src/gsst.c
@@ -1071,7 +1071,6 @@ GR_ENTRY(grSstControl, FxBool, ( GrControl_t code ))
 {
 #define FN_NAME "grSstControl"  
 
-  GR_DCL_GC;
   GDBG_INFO((41, "%s:  code = 0x%x, windowsInit = %d\n", FN_NAME,
              code, _GlideRoot.windowsInit));
   
@@ -1150,6 +1149,7 @@ GR_ENTRY(grSstControl, FxBool, ( GrControl_t code ))
     ctrlflag = initControl(code);
 #if (GLIDE_PLATFORM & GLIDE_OS_WIN32)
     {
+      GR_DCL_GC;
       if (gc->oemInit) {
         FARPROC oemControl = GetProcAddress(gc->oemInit, "_fxoemControl@4");
         if (oemControl)