diff --git a/source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h b/source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h
index 8df0b7695..a4ca6a854 100644
--- a/source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h
+++ b/source/shared_lib/include/graphics/freetype-gl/vertex-buffer.h
@@ -37,17 +37,9 @@
 
 #define	WIN32_LEAN_AND_MEAN
 #include <windows.h>
-//#include "gl.h"
-#include <GL/glew.h>
-
-//#include <GL/glu.h>
-//#include "glext.h"
-//typedef char GLchar;		/* native character */
-//#define GL_BOOL 0x8B56
-
-#else
-    #include <GL/glu.h>
 #endif
+
+#include <GL/glew.h>
 #include "vector.h"
 
 #define MAX_VERTEX_ATTRIBUTE 64
diff --git a/source/shared_lib/include/graphics/md5/Md5Model.h b/source/shared_lib/include/graphics/md5/Md5Model.h
index fff516987..607e00015 100644
--- a/source/shared_lib/include/graphics/md5/Md5Model.h
+++ b/source/shared_lib/include/graphics/md5/Md5Model.h
@@ -30,7 +30,7 @@
 #include <fstream>
 #include <stdexcept>
 //#include <tr1/memory>
-#include <GL/gl.h>
+#include <GL/glew.h>
 
 #include "Mathlib.h"
 #include "md5Texture.h"
diff --git a/source/shared_lib/include/graphics/md5/md5Texture.h b/source/shared_lib/include/graphics/md5/md5Texture.h
index faf4264f3..20e97618c 100644
--- a/source/shared_lib/include/graphics/md5/md5Texture.h
+++ b/source/shared_lib/include/graphics/md5/md5Texture.h
@@ -22,10 +22,7 @@
 #include <windows.h>
 #endif // _WIN32
 
-#include <GL/gl.h>
-#ifndef _WIN32
-#include <GL/glext.h>
-#endif
+#include <GL/glew.h>
 #include <memory>
 #include <stdexcept>
 #include <string>
diff --git a/source/shared_lib/include/platform/sdl/gl_wrap.h b/source/shared_lib/include/platform/sdl/gl_wrap.h
index 07dff3589..27c56798a 100644
--- a/source/shared_lib/include/platform/sdl/gl_wrap.h
+++ b/source/shared_lib/include/platform/sdl/gl_wrap.h
@@ -16,20 +16,13 @@
 #include <windows.h>
 
 #include <GL/glew.h>
-//#include "gl.h"
-
-//#include <GL/gl.h>
-//#include <GL/glu.h>
-//#include <glprocs.h>
 
 #define GLEST_GLPROC(X, Y) inline X( static a= wglGetProcAddress(a); return a;)
 
 #else
 
 #include <GL/glew.h>
-#include <SDL.h>
 #define GL_GLEXT_PROTOTYPES
-//#include <SDL_opengl.h>
 
 #endif
 
diff --git a/source/shared_lib/include/platform/sdl/platform_main.h b/source/shared_lib/include/platform/sdl/platform_main.h
index e837c4143..827b7ca3a 100644
--- a/source/shared_lib/include/platform/sdl/platform_main.h
+++ b/source/shared_lib/include/platform/sdl/platform_main.h
@@ -13,7 +13,6 @@
 
 #include <SDL.h>
 #include <iostream>
-//#include "gl.h"
 #include <GL/glew.h>
 #include "leak_dumper.h"
 
diff --git a/source/shared_lib/sources/graphics/freetype-gl/texture-atlas.c b/source/shared_lib/sources/graphics/freetype-gl/texture-atlas.c
index 6919ace96..6f0eafbc7 100644
--- a/source/shared_lib/sources/graphics/freetype-gl/texture-atlas.c
+++ b/source/shared_lib/sources/graphics/freetype-gl/texture-atlas.c
@@ -30,23 +30,12 @@
  * those of the authors and should not be interpreted as representing official
  * policies, either expressed or implied, of Nicolas P. Rougier.
  * ========================================================================= */
-#if defined(__APPLE__)
-    //#include <Glut/glut.h>
-#else
-    //#include <GL/glut.h>
-#endif
-//#include <stdlib.h>
 
 #ifdef WIN32
 #include <windows.h>
 #endif
 
-//#include "gl.h"
 #include <GL/glew.h>
-
-//#include <GL/gl.h>
-//#include <GL/glu.h>
-//#include <glprocs.h>
 
 #include <string.h>
 #include <assert.h>
diff --git a/source/shared_lib/sources/graphics/freetype-gl/texture-font.c b/source/shared_lib/sources/graphics/freetype-gl/texture-font.c
index 6085bad63..ac05fc877 100644
--- a/source/shared_lib/sources/graphics/freetype-gl/texture-font.c
+++ b/source/shared_lib/sources/graphics/freetype-gl/texture-font.c
@@ -34,7 +34,6 @@
 #include FT_FREETYPE_H
 // #include FT_ADVANCES_H
 #include FT_LCD_FILTER_H
-//#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
diff --git a/source/shared_lib/sources/graphics/freetype-gl/texture-glyph.c b/source/shared_lib/sources/graphics/freetype-gl/texture-glyph.c
index 96e56a5a5..93d19eb24 100644
--- a/source/shared_lib/sources/graphics/freetype-gl/texture-glyph.c
+++ b/source/shared_lib/sources/graphics/freetype-gl/texture-glyph.c
@@ -34,13 +34,9 @@
 
 #define	WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <GL/glew.h>
-//#include "gl.h"
-
-#else
-    #include <GL/glu.h>
 #endif
 
+#include <GL/glew.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "texture-font.h"
diff --git a/source/shared_lib/sources/graphics/freetype-gl/vector.c b/source/shared_lib/sources/graphics/freetype-gl/vector.c
index 1500c03b8..9bd93e437 100644
--- a/source/shared_lib/sources/graphics/freetype-gl/vector.c
+++ b/source/shared_lib/sources/graphics/freetype-gl/vector.c
@@ -36,8 +36,6 @@
 #include <stdio.h>
 #include "vector.h"
 
-
-
 /* ------------------------------------------------------------------------- */
 Vector *
 vector_new( size_t item_size )
diff --git a/source/shared_lib/sources/graphics/gl/font_text_freetypegl.cpp b/source/shared_lib/sources/graphics/gl/font_text_freetypegl.cpp
index 2ed2431b5..3ca59c805 100644
--- a/source/shared_lib/sources/graphics/gl/font_text_freetypegl.cpp
+++ b/source/shared_lib/sources/graphics/gl/font_text_freetypegl.cpp
@@ -14,7 +14,6 @@
 #include "font_text_freetypegl.h"
 #include "vector.h"
 
-//#include "opengl.h"
 #include <stdexcept>
 #include <sys/stat.h>
 
@@ -32,10 +31,6 @@ using namespace Shared::PlatformCommon;
 
 namespace Shared { namespace Graphics { namespace Gl {
 
-
-//string TextFreetypeGL::langHeightText = "yW";
-//int TextFreetypeGL::faceResolution 	= 72;
-
 //====================================================================
 TextFreetypeGL::TextFreetypeGL(FontTextHandlerType type) : Text(type) {
 	buffer=NULL;
diff --git a/source/shared_lib/sources/graphics/md5/GlErrors.cpp b/source/shared_lib/sources/graphics/md5/GlErrors.cpp
index 6100833ed..9805a447a 100644
--- a/source/shared_lib/sources/graphics/md5/GlErrors.cpp
+++ b/source/shared_lib/sources/graphics/md5/GlErrors.cpp
@@ -20,13 +20,9 @@
 #include <windows.h>
 #endif // _WIN32
 
-//#include "gl.h"
 #include <GL/glew.h>
 
-//#include <GL/gl.h>
-//#include <GL/glu.h>
 #include <iostream>
-
 #include "GlErrors.h"
 
 namespace Shared { namespace Graphics { namespace md5 {