diff --git a/core/wsi/wgl.cpp b/core/wsi/wgl.cpp
index 57b8c38d6..a85858926 100644
--- a/core/wsi/wgl.cpp
+++ b/core/wsi/wgl.cpp
@@ -25,7 +25,11 @@
 
 WGLGraphicsContext theGLContext;
 
-bool WGLContext::Init()
+PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB;
+PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
+PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT;
+
+bool WGLGraphicsContext::Init()
 {
 	if (ourOpenGLRenderingContext != NULL)
 		// Already initialized
@@ -111,7 +115,7 @@ bool WGLContext::Init()
 	return rv;
 }
 
-void WGLContext::Swap()
+void WGLGraphicsContext::Swap()
 {
 #ifdef TEST_AUTOMATION
 	do_swap_automation();
@@ -119,7 +123,7 @@ void WGLContext::Swap()
 	wglSwapLayerBuffers(ourWindowHandleToDeviceContext, WGL_SWAP_MAIN_PLANE);
 }
 
-void WGLContext::Term()
+void WGLGraphicsContext::Term()
 {
 	if (ourOpenGLRenderingContext != NULL)
 	{
diff --git a/core/wsi/wgl.h b/core/wsi/wgl.h
index 78a1a837b..b075a1610 100644
--- a/core/wsi/wgl.h
+++ b/core/wsi/wgl.h
@@ -52,10 +52,6 @@ typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAt
 typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList);
 typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
 
-PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB;
-PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
-PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT;
-
 
 class WGLGraphicsContext
 {