diff --git a/.gitattributes b/.gitattributes
index c102d56..e2aa225 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -132,24 +132,24 @@ freeglut/freeglut/progs/demos/subwin/subwin.dsp -text
 freeglut/freeglut/progs/demos/subwin/subwinStatic.dsp -text
 freeglut/freeglut/progs/demos/timer/timer.c -text
 freeglut/freeglut/src/Makefile.am svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/android/freeglut_gamemode_android.c -text
-freeglut/freeglut/src/android/freeglut_input_devices_android.c -text
-freeglut/freeglut/src/android/freeglut_internal_android.h -text
-freeglut/freeglut/src/android/freeglut_joystick_android.c -text
-freeglut/freeglut/src/android/freeglut_main_android.c -text
-freeglut/freeglut/src/android/freeglut_runtime_android.c -text
-freeglut/freeglut/src/android/freeglut_spaceball_android.c -text
-freeglut/freeglut/src/android/freeglut_state_android.c -text
-freeglut/freeglut/src/android/freeglut_window_android.c -text
+freeglut/freeglut/src/android/fg_gamemode_android.c -text
+freeglut/freeglut/src/android/fg_input_devices_android.c -text
+freeglut/freeglut/src/android/fg_internal_android.h -text
+freeglut/freeglut/src/android/fg_joystick_android.c -text
+freeglut/freeglut/src/android/fg_main_android.c -text
+freeglut/freeglut/src/android/fg_runtime_android.c -text
+freeglut/freeglut/src/android/fg_spaceball_android.c -text
+freeglut/freeglut/src/android/fg_state_android.c -text
+freeglut/freeglut/src/android/fg_window_android.c -text
 freeglut/freeglut/src/android/native_app_glue/README -text
 freeglut/freeglut/src/android/native_app_glue/android_native_app_glue.c -text
 freeglut/freeglut/src/android/native_app_glue/android_native_app_glue.h -text
 freeglut/freeglut/src/android/opengles_stubs.c -text
-freeglut/freeglut/src/egl/freeglut_display_egl.c -text
-freeglut/freeglut/src/egl/freeglut_init_egl.c -text
-freeglut/freeglut/src/egl/freeglut_internal_egl.h -text
-freeglut/freeglut/src/egl/freeglut_structure_egl.c -text
-freeglut/freeglut/src/egl/freeglut_window_egl.c -text
+freeglut/freeglut/src/egl/fg_display_egl.c -text
+freeglut/freeglut/src/egl/fg_init_egl.c -text
+freeglut/freeglut/src/egl/fg_internal_egl.h -text
+freeglut/freeglut/src/egl/fg_structure_egl.c -text
+freeglut/freeglut/src/egl/fg_window_egl.c -text
 freeglut/freeglut/src/fg_callbacks.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/fg_cursor.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/fg_display.c svn_keywords=Author+Date+Id+Revision
diff --git a/freeglut/freeglut/src/android/freeglut_gamemode_android.c b/freeglut/freeglut/src/android/fg_gamemode_android.c
similarity index 97%
rename from freeglut/freeglut/src/android/freeglut_gamemode_android.c
rename to freeglut/freeglut/src/android/fg_gamemode_android.c
index d5f2316..8cd3034 100644
--- a/freeglut/freeglut/src/android/freeglut_gamemode_android.c
+++ b/freeglut/freeglut/src/android/fg_gamemode_android.c
@@ -24,7 +24,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * Changes the current display mode to match user's settings
diff --git a/freeglut/freeglut/src/android/freeglut_input_devices_android.c b/freeglut/freeglut/src/android/fg_input_devices_android.c
similarity index 97%
rename from freeglut/freeglut/src/android/freeglut_input_devices_android.c
rename to freeglut/freeglut/src/android/fg_input_devices_android.c
index 41f900d..ac3aea5 100644
--- a/freeglut/freeglut/src/android/freeglut_input_devices_android.c
+++ b/freeglut/freeglut/src/android/fg_input_devices_android.c
@@ -28,8 +28,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include <stdio.h>
 typedef struct _serialport SERIALPORT;
 
 /*
diff --git a/freeglut/freeglut/src/android/freeglut_internal_android.h b/freeglut/freeglut/src/android/fg_internal_android.h
similarity index 98%
rename from freeglut/freeglut/src/android/freeglut_internal_android.h
rename to freeglut/freeglut/src/android/fg_internal_android.h
index 8396ccc..83373de 100644
--- a/freeglut/freeglut/src/android/freeglut_internal_android.h
+++ b/freeglut/freeglut/src/android/fg_internal_android.h
@@ -29,7 +29,7 @@
 
 /* -- PLATFORM-SPECIFIC INCLUDES ------------------------------------------- */
 /* Android OpenGL ES is accessed through EGL */
-#include "../egl/freeglut_internal_egl.h"
+#include "egl/fg_internal_egl.h"
 
 /**
  * Virtual PAD (spots on touchscreen that simulate keys)
diff --git a/freeglut/freeglut/src/android/freeglut_joystick_android.c b/freeglut/freeglut/src/android/fg_joystick_android.c
similarity index 97%
rename from freeglut/freeglut/src/android/freeglut_joystick_android.c
rename to freeglut/freeglut/src/android/fg_joystick_android.c
index e3a5059..5328285 100644
--- a/freeglut/freeglut/src/android/freeglut_joystick_android.c
+++ b/freeglut/freeglut/src/android/fg_joystick_android.c
@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
 {
diff --git a/freeglut/freeglut/src/android/freeglut_main_android.c b/freeglut/freeglut/src/android/fg_main_android.c
similarity index 99%
rename from freeglut/freeglut/src/android/freeglut_main_android.c
rename to freeglut/freeglut/src/android/fg_main_android.c
index a1a8451..83aac13 100644
--- a/freeglut/freeglut/src/android/freeglut_main_android.c
+++ b/freeglut/freeglut/src/android/fg_main_android.c
@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 #include <android/log.h>
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "FreeGLUT", __VA_ARGS__))
diff --git a/freeglut/freeglut/src/android/freeglut_runtime_android.c b/freeglut/freeglut/src/android/fg_runtime_android.c
similarity index 100%
rename from freeglut/freeglut/src/android/freeglut_runtime_android.c
rename to freeglut/freeglut/src/android/fg_runtime_android.c
diff --git a/freeglut/freeglut/src/android/freeglut_spaceball_android.c b/freeglut/freeglut/src/android/fg_spaceball_android.c
similarity index 97%
rename from freeglut/freeglut/src/android/freeglut_spaceball_android.c
rename to freeglut/freeglut/src/android/fg_spaceball_android.c
index 860f3d7..2f04d67 100644
--- a/freeglut/freeglut/src/android/freeglut_spaceball_android.c
+++ b/freeglut/freeglut/src/android/fg_spaceball_android.c
@@ -30,7 +30,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 void fgPlatformInitializeSpaceball(void)
 {
diff --git a/freeglut/freeglut/src/android/freeglut_state_android.c b/freeglut/freeglut/src/android/fg_state_android.c
similarity index 98%
rename from freeglut/freeglut/src/android/freeglut_state_android.c
rename to freeglut/freeglut/src/android/fg_state_android.c
index 09b2f78..e22b86c 100644
--- a/freeglut/freeglut/src/android/freeglut_state_android.c
+++ b/freeglut/freeglut/src/android/fg_state_android.c
@@ -26,9 +26,9 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
-
+#include <stdio.h>
 #include <android/native_window.h>
+#include "fg_internal.h"
 
 int fgPlatformGlutGet ( GLenum eWhat )
 {
diff --git a/freeglut/freeglut/src/android/freeglut_window_android.c b/freeglut/freeglut/src/android/fg_window_android.c
similarity index 99%
rename from freeglut/freeglut/src/android/freeglut_window_android.c
rename to freeglut/freeglut/src/android/fg_window_android.c
index 70388aa..8b1f682 100644
--- a/freeglut/freeglut/src/android/freeglut_window_android.c
+++ b/freeglut/freeglut/src/android/fg_window_android.c
@@ -28,7 +28,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 extern EGLSurface fghEGLPlatformOpenWindow( EGLNativeWindowType handle );
 
 /*
diff --git a/freeglut/freeglut/src/android/opengles_stubs.c b/freeglut/freeglut/src/android/opengles_stubs.c
index 732652b..c8437ce 100644
--- a/freeglut/freeglut/src/android/opengles_stubs.c
+++ b/freeglut/freeglut/src/android/opengles_stubs.c
@@ -1,5 +1,5 @@
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 void fgDeactivateMenu( SFG_Window *window ) {
   fprintf(stderr, "fgDeactivateMenu: STUB\n");
diff --git a/freeglut/freeglut/src/egl/freeglut_display_egl.c b/freeglut/freeglut/src/egl/fg_display_egl.c
similarity index 97%
rename from freeglut/freeglut/src/egl/freeglut_display_egl.c
rename to freeglut/freeglut/src/egl/fg_display_egl.c
index 1a25362..260b6ab 100644
--- a/freeglut/freeglut/src/egl/freeglut_display_egl.c
+++ b/freeglut/freeglut/src/egl/fg_display_egl.c
@@ -24,7 +24,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 #include <android/log.h>
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "FreeGLUT", __VA_ARGS__))
diff --git a/freeglut/freeglut/src/egl/freeglut_init_egl.c b/freeglut/freeglut/src/egl/fg_init_egl.c
similarity index 98%
rename from freeglut/freeglut/src/egl/freeglut_init_egl.c
rename to freeglut/freeglut/src/egl/fg_init_egl.c
index 9d03349..a58812a 100644
--- a/freeglut/freeglut/src/egl/freeglut_init_egl.c
+++ b/freeglut/freeglut/src/egl/fg_init_egl.c
@@ -25,7 +25,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 #include <android/native_app_glue/android_native_app_glue.h>
 
diff --git a/freeglut/freeglut/src/egl/freeglut_internal_egl.h b/freeglut/freeglut/src/egl/fg_internal_egl.h
similarity index 100%
rename from freeglut/freeglut/src/egl/freeglut_internal_egl.h
rename to freeglut/freeglut/src/egl/fg_internal_egl.h
diff --git a/freeglut/freeglut/src/egl/freeglut_structure_egl.c b/freeglut/freeglut/src/egl/fg_structure_egl.c
similarity index 97%
rename from freeglut/freeglut/src/egl/freeglut_structure_egl.c
rename to freeglut/freeglut/src/egl/fg_structure_egl.c
index b465f1e..0466bc8 100644
--- a/freeglut/freeglut/src/egl/freeglut_structure_egl.c
+++ b/freeglut/freeglut/src/egl/fg_structure_egl.c
@@ -24,7 +24,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 extern SFG_Structure fgStructure;
 
diff --git a/freeglut/freeglut/src/egl/freeglut_window_egl.c b/freeglut/freeglut/src/egl/fg_window_egl.c
similarity index 99%
rename from freeglut/freeglut/src/egl/freeglut_window_egl.c
rename to freeglut/freeglut/src/egl/fg_window_egl.c
index b2e70b7..6b980bd 100644
--- a/freeglut/freeglut/src/egl/freeglut_window_egl.c
+++ b/freeglut/freeglut/src/egl/fg_window_egl.c
@@ -24,7 +24,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "fg_internal.h"
 
 /**
  * Initialize an EGL context for the current display.