diff --git a/freeglut/freeglut/src/fg_init.c b/freeglut/freeglut/src/fg_init.c
index 1e71931..a553b9b 100644
--- a/freeglut/freeglut/src/fg_init.c
+++ b/freeglut/freeglut/src/fg_init.c
@@ -28,7 +28,6 @@
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
 #include "fg_internal.h"
-#include "fg_gl2.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -381,8 +380,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
         if( (mask & (XValue|YValue)) == (XValue|YValue) )
             fgState.Position.Use = GL_TRUE;
     }
-
-    fgInitGL2();
 }
 
 /*
diff --git a/freeglut/freeglut/src/fg_window.c b/freeglut/freeglut/src/fg_window.c
index 9a980f8..5c431ea 100644
--- a/freeglut/freeglut/src/fg_window.c
+++ b/freeglut/freeglut/src/fg_window.c
@@ -28,6 +28,7 @@
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
 #include "fg_internal.h"
+#include "fg_gl2.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -147,6 +148,8 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 #endif
     window->Window.attribute_v_coord = -1;
     window->Window.attribute_v_normal = -1;
+
+    fgInitGL2();
 }
 
 /*