diff --git a/source/Irrlicht/COGLCoreCacheHandler.h b/source/Irrlicht/COGLCoreCacheHandler.h
index ff8371df..4ac4ae4c 100644
--- a/source/Irrlicht/COGLCoreCacheHandler.h
+++ b/source/Irrlicht/COGLCoreCacheHandler.h
@@ -9,8 +9,8 @@
 
 #if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
 
-#include "EDriverTypes.h"
 #include "SMaterial.h"
+#include "ITexture.h"
 
 namespace irr
 {
@@ -454,7 +454,6 @@ public:
 		if (FrameBufferID != frameBufferID)
 		{
 			Driver->irrGlBindFramebuffer(GL_FRAMEBUFFER, frameBufferID);
-
 			FrameBufferID = frameBufferID;
 		}
 	}
@@ -465,7 +464,7 @@ public:
 	{
 		if (ProgramID != programID)
 		{
-			glUseProgram(programID);
+			Driver->irrGlUseProgram(programID);
 			ProgramID = programID;
 		}
 	}
diff --git a/source/Irrlicht/COGLCoreRenderTarget.h b/source/Irrlicht/COGLCoreRenderTarget.h
index 596a8c9e..fbab2670 100644
--- a/source/Irrlicht/COGLCoreRenderTarget.h
+++ b/source/Irrlicht/COGLCoreRenderTarget.h
@@ -11,8 +11,6 @@
 
 #include "IRenderTarget.h"
 
-#include "dimension2d.h"
-
 namespace irr
 {
 namespace video
diff --git a/source/Irrlicht/COpenGLCacheHandler.cpp b/source/Irrlicht/COpenGLCacheHandler.cpp
index 9e6f48df..a54ed45b 100644
--- a/source/Irrlicht/COpenGLCacheHandler.cpp
+++ b/source/Irrlicht/COpenGLCacheHandler.cpp
@@ -18,7 +18,7 @@ namespace video
 
 COpenGLCacheHandler::COpenGLCacheHandler(COpenGLDriver* driver) :
 	COGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>(driver), AlphaMode(GL_ALWAYS), AlphaRef(0.f), AlphaTest(false),
-	DepthTest(false), MatrixMode(GL_MODELVIEW), ClientActiveTexture(GL_TEXTURE0_ARB), ClientStateVertex(false),
+	DepthTest(false), MatrixMode(GL_MODELVIEW), ClientActiveTexture(GL_TEXTURE0), ClientStateVertex(false),
 	ClientStateNormal(false), ClientStateColor(false), ClientStateTexCoord0(false)
 {
 	// Initial OpenGL values from specification.
diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h
index 3e18b4de..469e723a 100644
--- a/source/Irrlicht/COpenGLExtensionHandler.h
+++ b/source/Irrlicht/COpenGLExtensionHandler.h
@@ -1218,7 +1218,7 @@ class COpenGLExtensionHandler
 	// that handleARB and uint are the same type
 	void extGlLinkProgram(GLuint program);
 	void extGlUseProgramObject(GLhandleARB prog);
-	void extGlUseProgram(GLuint prog);
+	void irrGlUseProgram(GLuint prog);
 	void extGlDeleteObject(GLhandleARB object);
 	void extGlDeleteProgram(GLuint object);
 	void extGlDeleteShader(GLuint shader);
@@ -1733,7 +1733,7 @@ inline void COpenGLExtensionHandler::extGlUseProgramObject(GLhandleARB prog)
 #endif
 }
 
-inline void COpenGLExtensionHandler::extGlUseProgram(GLuint prog)
+inline void COpenGLExtensionHandler::irrGlUseProgram(GLuint prog)
 {
 #ifdef _IRR_OPENGL_USE_EXTPOINTER_
 	if (pGlUseProgram)
diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.cpp b/source/Irrlicht/COpenGLSLMaterialRenderer.cpp
index 10f13745..0062b7a9 100644
--- a/source/Irrlicht/COpenGLSLMaterialRenderer.cpp
+++ b/source/Irrlicht/COpenGLSLMaterialRenderer.cpp
@@ -238,7 +238,7 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
 	if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
 	{
 		if (Program2)
-			Driver->extGlUseProgram(Program2);
+			Driver->irrGlUseProgram(Program2);
 		else if (Program)
 			Driver->extGlUseProgramObject(Program);
 	}
@@ -290,7 +290,7 @@ void COpenGLSLMaterialRenderer::OnUnsetMaterial()
 	if (Program)
 		Driver->extGlUseProgramObject(0);
 	if (Program2)
-		Driver->extGlUseProgram(0);
+		Driver->irrGlUseProgram(0);
 }