diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 85d8d454e..0d7404c77 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -3487,7 +3487,7 @@ static gl_vissprite_t *HWR_NewVisSprite(void)
 typedef struct
 {
 	FOutVector verts[4];
-	gr_vissprite_t *spr;
+	gl_vissprite_t *spr;
 } zbuffersprite_t;
 
 // this list is used to store data about linkdraw sprites
@@ -3495,7 +3495,7 @@ zbuffersprite_t linkdrawlist[MAXVISSPRITES];
 UINT32 linkdrawcount = 0;
 
 // add the necessary data to the list for delayed z-buffer drawing
-static void HWR_LinkDrawHackAdd(FOutVector *verts, gr_vissprite_t *spr)
+static void HWR_LinkDrawHackAdd(FOutVector *verts, gl_vissprite_t *spr)
 {
 	if (linkdrawcount < MAXVISSPRITES)
 	{
@@ -5007,11 +5007,11 @@ static void HWR_ProjectSprite(mobj_t *thing)
 
 		// calculate tz for tracer, same way it is calculated for this sprite
 		// transform the origin point
-		tr_x = FIXED_TO_FLOAT(thing->tracer->x) - gr_viewx;
-		tr_y = FIXED_TO_FLOAT(thing->tracer->y) - gr_viewy;
+		tr_x = FIXED_TO_FLOAT(thing->tracer->x) - gl_viewx;
+		tr_y = FIXED_TO_FLOAT(thing->tracer->y) - gl_viewy;
 
 		// rotation around vertical axis
-		tracertz = (tr_x * gr_viewcos) + (tr_y * gr_viewsin);
+		tracertz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin);
 
 		// Software does not render the linkdraw sprite if the tracer is behind the view plane,
 		// so do the same check here.
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index b23b3600c..fa5156758 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1309,13 +1309,13 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
 		// texture loading before model init, so it knows if sprite graphics are used, which
 		// means that texture coordinates have to be adjusted
 		gpatch = md2->grpatch;
-		if (!gpatch || ((!gpatch->mipmap->grInfo.format || !gpatch->mipmap->downloaded) && !md2->notexturefile))
+		if (!gpatch || ((!gpatch->mipmap->format || !gpatch->mipmap->downloaded) && !md2->notexturefile))
 			md2_loadTexture(md2);
 		gpatch = md2->grpatch; // Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
 
-		if ((gpatch && gpatch->mipmap->grInfo.format) // don't load the blend texture if the base texture isn't available
+		if ((gpatch && gpatch->mipmap->format) // don't load the blend texture if the base texture isn't available
 			&& (!md2->blendgrpatch
-			|| ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->grInfo.format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded)
+			|| ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded)
 			&& !md2->noblendfile)))
 			md2_loadBlendTexture(md2);
 
@@ -1332,7 +1332,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
 				md2_printModelInfo(md2->model);
 				// if model uses sprite patch as texture, then
 				// adjust texture coordinates to take power of two textures into account
-				if (!gpatch || !gpatch->mipmap->grInfo.format)
+				if (!gpatch || !gpatch->mipmap->format)
 					adjustTextureCoords(md2->model, spr->gpatch);
 				HWD.pfnCreateModelVBOs(md2->model);
 			}