moved common files back to src root

renamed (a bunch of) the freeglut_ prefixes to fg_
did the necessary edits of the source files (I hope)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1111 7f0cb862-5218-0410-a997-914c9d46530a

.gitattributes

@@ -131,34 +131,6 @@ freeglut/freeglut/progs/demos/subwin/subwin.c -text
 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/Common/freeglut_callbacks.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_cursor.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_display.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_ext.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_font.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_font_data.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_gamemode.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_geometry.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_init.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_input_devices.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_internal.h svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_joystick.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_main.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_menu.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_misc.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_overlay.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_spaceball.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_state.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_stroke_mono_roman.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_stroke_roman.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_structure.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_teapot.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_teapot_data.h svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_videoresize.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglut_window.c svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/freeglutdll.def svn_keywords=Author+Date+Id+Revision
-freeglut/freeglut/src/Common/xparsegeometry_repl.c -text
-freeglut/freeglut/src/Common/xparsegeometry_repl.h -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
@@ -178,6 +150,32 @@ 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/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
+freeglut/freeglut/src/fg_ext.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_font.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_font_data.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_gamemode.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_geometry.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_init.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_input_devices.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_internal.h svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_joystick.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_main.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_menu.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_misc.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_overlay.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_spaceball.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_state.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_stroke_mono_roman.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_stroke_roman.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_structure.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_teapot.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_teapot_data.h svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_videoresize.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/fg_window.c svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/freeglutdll.def svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/mswin/freeglut_display_mswin.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/mswin/freeglut_ext_mswin.c svn_keywords=Author+Date+Id+Revision
@@ -194,6 +192,8 @@ freeglut/freeglut/src/mswin/freeglut_structure_mswin.c svn_keywords=Author+Date+
 freeglut/freeglut/src/mswin/freeglut_window_mswin.c svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/templates/cpp_template svn_keywords=Author+Date+Id+Revision
 freeglut/freeglut/src/templates/header_template svn_keywords=Author+Date+Id+Revision
+freeglut/freeglut/src/util/xparsegeometry_repl.c -text
+freeglut/freeglut/src/util/xparsegeometry_repl.h -text
 freeglut/freeglut/src/x11 svnc_svn_005fkeywords=Author+Date+Id+Revision
 freeglut/freeglut/src/x11/freeglut_cursor_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision
 freeglut/freeglut/src/x11/freeglut_display_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision

freeglut/freeglut/src/fg_callbacks.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 

freeglut/freeglut/src/fg_cursor.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/fg_display.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 
 /* Function prototypes */

freeglut/freeglut/src/fg_ext.c

@@ -27,7 +27,7 @@
 
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 extern SFG_Proc fgPlatformGetProcAddress( const char *procName );
 extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName );

freeglut/freeglut/src/fg_font.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/fg_font_data.c

@@ -51,7 +51,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * The following bitmapped fonts are defined in this file:

freeglut/freeglut/src/fg_gamemode.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/fg_geometry.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/fg_init.c

@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -316,7 +316,7 @@ void fgDeinitialize( void )
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 #if !TARGET_HOST_POSIX_X11
-#   include "../Common/xparsegeometry_repl.h"
+#   include "util/xparsegeometry_repl.h"
 #endif
 
 /*

freeglut/freeglut/src/fg_input_devices.c

@@ -33,7 +33,7 @@
 #endif
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 typedef struct _serialport SERIALPORT;
 

freeglut/freeglut/src/fg_internal.h

@@ -1,5 +1,5 @@
 /*
- * freeglut_internal.h
+ * fg_internal.h
  *
  * The freeglut library private include file.
  *
@@ -173,13 +173,13 @@
 
 /* Platform-specific includes */
 #if TARGET_HOST_POSIX_X11
-#include "../x11/freeglut_internal_x11.h"
+#include "x11/fg_internal_x11.h"
 #endif
 #if TARGET_HOST_MS_WINDOWS
-#include "../mswin/freeglut_internal_mswin.h"
+#include "mswin/fg_internal_mswin.h"
 #endif
 #if TARGET_HOST_ANDROID
-#include "../android/freeglut_internal_android.h"
+#include "android/fg_internal_android.h"
 #endif
 
 

freeglut/freeglut/src/fg_joystick.c

@@ -32,7 +32,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 #ifdef HAVE_SYS_PARAM_H
 #    include <sys/param.h>
 #endif

freeglut/freeglut/src/fg_main.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 #ifdef HAVE_ERRNO_H
 #    include <errno.h>
 #endif

freeglut/freeglut/src/fg_menu.c

@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- DEFINITIONS ---------------------------------------------------------- */
 

freeglut/freeglut/src/fg_misc.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/fg_overlay.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * NOTE: functions declared in this file probably will not be implemented.

freeglut/freeglut/src/fg_spaceball.c

@@ -8,7 +8,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 

freeglut/freeglut/src/fg_state.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/fg_stroke_mono_roman.c

@@ -29,7 +29,7 @@
 /* This file has been automatically generated by the genstroke utility. */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* char: 0x20 */
 

freeglut/freeglut/src/fg_stroke_roman.c

@@ -29,7 +29,7 @@
 /* This file has been automatically generated by the genstroke utility. */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* char: 0x20 */
 

freeglut/freeglut/src/fg_structure.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /* -- GLOBAL EXPORTS ------------------------------------------------------- */
 

freeglut/freeglut/src/fg_teapot.c

@@ -73,8 +73,8 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
-#include "freeglut_teapot_data.h"
+#include "fg_teapot_data.h"
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 

freeglut/freeglut/src/fg_videoresize.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * NOTE: functions declared in this file probably will not be implemented.

freeglut/freeglut/src/fg_window.c

@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "freeglut_internal.h"
+#include "fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 

freeglut/freeglut/src/mswin/freeglut_display_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 

freeglut/freeglut/src/mswin/freeglut_ext_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {

freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /*
  * Remembers the current visual settings, so that

freeglut/freeglut/src/mswin/freeglut_init_mswin.c

@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 

freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #include <sys/types.h>
 #include <winbase.h>

freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 #if !defined(_WIN32_WCE)

freeglut/freeglut/src/mswin/freeglut_main_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 extern void fghRedrawWindow ( SFG_Window *window );

freeglut/freeglut/src/mswin/freeglut_menu_mswin.c

@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )

freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c

@@ -30,7 +30,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 void fgPlatformInitializeSpaceball(void)
 {

freeglut/freeglut/src/mswin/freeglut_state_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,

freeglut/freeglut/src/mswin/freeglut_structure_mswin.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 void fgPlatformCreateWindow ( SFG_Window *window )

freeglut/freeglut/src/mswin/freeglut_window_mswin.c

@@ -27,7 +27,7 @@
 
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 
 /* The following include file is available from SGI but is not standard:

freeglut/freeglut/src/util/xparsegeometry_repl.c

@@ -32,7 +32,7 @@ from The Open Group.
 
 */
 
-#include "../Common/xparsegeometry_repl.h"
+#include "xparsegeometry_repl.h"
 
 /*
  *   XParseGeometry parses strings of the form

freeglut/freeglut/src/x11/freeglut_cursor_x11.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /* This code is for Posix/X11, Solaris, and OSX */
 #include <X11/cursorfont.h>

freeglut/freeglut/src/x11/freeglut_display_x11.c

@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
 {

freeglut/freeglut/src/x11/freeglut_ext_x11.c

@@ -28,7 +28,7 @@
 
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {

freeglut/freeglut/src/x11/freeglut_gamemode_x11.c

@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
 {

freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c

@@ -71,7 +71,7 @@
 #undef glutBitmapHelvetica12
 #undef glutBitmapHelvetica18
 
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 struct freeglutStrokeFont
 {

freeglut/freeglut/src/x11/freeglut_init_x11.c

@@ -29,7 +29,7 @@
 #define FREEGLUT_BUILDING_LIB
 #include <limits.h>  /* LONG_MAX */
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /* Return the atom associated with "name". */
 static Atom fghGetAtom(const char * name)

freeglut/freeglut/src/x11/freeglut_input_devices_x11.c

@@ -35,7 +35,7 @@
 #endif
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

freeglut/freeglut/src/x11/freeglut_joystick_x11.c

@@ -34,7 +34,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 #ifdef HAVE_SYS_PARAM_H
 #    include <sys/param.h>
 #endif

freeglut/freeglut/src/x11/freeglut_main_x11.c

@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 #ifdef HAVE_ERRNO_H
 #    include <errno.h>
 #endif

freeglut/freeglut/src/x11/freeglut_menu_x11.c

@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /*
  *  * Private function to get the virtual maximum screen extent

freeglut/freeglut/src/x11/freeglut_spaceball_x11.c

@@ -10,7 +10,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #include <X11/Xlib.h>
 

freeglut/freeglut/src/x11/freeglut_state_x11.c

@@ -26,7 +26,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:

freeglut/freeglut/src/x11/freeglut_structure_x11.c

@@ -27,7 +27,7 @@
  */
 
 #include <GL/freeglut.h>
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 extern SFG_Structure fgStructure;
 

freeglut/freeglut/src/x11/freeglut_window_x11.c

@@ -30,7 +30,7 @@
 #include <GL/freeglut.h>
 #include <limits.h>  /* LONG_MAX */
 #include <unistd.h>  /* usleep */
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 /* pushing attribute/value pairs into an array */
 #define ATTRIB(a) attributes[where++]=(a)

freeglut/freeglut/src/x11/freeglut_xinput_x11.c

@@ -3,7 +3,7 @@
 
 #include <GL/freeglut.h>
 
-#include "../Common/freeglut_internal.h"
+#include "../fg_internal.h"
 
 #if HAVE_X11_EXTENSIONS_XINPUT2_H