diff --git a/.gitignore b/.gitignore
index 1a48989..8d0e2c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,11 +62,11 @@ third_party/*
 recorder/gits_config.txt
 
 # OpenGL
-OpenGL/common/include/glIDswitch.h
-OpenGL/common/include/glIDs.h
 OpenGL/common/glFunctions.cpp
 OpenGL/common/include/glDrivers.h
 OpenGL/common/include/glFunctions.h
+OpenGL/common/include/glIDs.h
+OpenGL/common/include/glIDswitch.h
 OpenGL/recorder/include/openglRecorderWrapperAuto.h
 OpenGL/recorder/include/openglRecorderWrapperIfaceAuto.h
 OpenGL/recorder/openglRecorderWrapperAuto.cpp
diff --git a/OpenGL/CMakeLists.txt b/OpenGL/CMakeLists.txt
index 57b70d9..4780004 100644
--- a/OpenGL/CMakeLists.txt
+++ b/OpenGL/CMakeLists.txt
@@ -23,10 +23,10 @@ set_target_properties(OpenGL_codegen PROPERTIES FOLDER OpenGL)
 # GENERATED property is set in CMakeLists.txt in each directory, but this
 # staying here doesn't do any harm
 set_source_files_properties(
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/include/glIDs.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/common/include/glIDswitch.h
   ${CMAKE_CURRENT_SOURCE_DIR}/common/include/glDrivers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/common/include/glFunctions.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/common/include/glIDs.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/common/include/glIDswitch.h
   ${CMAKE_CURRENT_SOURCE_DIR}/common/glFunctions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/recorder/openglRecorderWrapperAuto.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/recorder/include/openglRecorderWrapperAuto.h
diff --git a/OpenGL/codegen/gitsGLFuncsGenerator.py b/OpenGL/codegen/gitsGLFuncsGenerator.py
index f83cac6..9341d0f 100644
--- a/OpenGL/codegen/gitsGLFuncsGenerator.py
+++ b/OpenGL/codegen/gitsGLFuncsGenerator.py
@@ -1232,11 +1232,11 @@ def copy_file(filename, subdir):
     shutil.copy2(filename, path)
 
 
+move_file('glFunctions.cpp', 'common')
+move_file('glFunctions.h', 'common/include')
+move_file('glDrivers.h', 'common/include')
 copy_file('glIDs.h', 'common/include')
 move_file('glIDswitch.h', 'common/include')
-move_file('glDrivers.h', 'common/include')
-move_file('glFunctions.h', 'common/include')
-move_file('glFunctions.cpp', 'common')
 move_file('openglRecorderWrapperAuto.cpp', 'recorder')
 move_file('openglRecorderWrapperAuto.h', 'recorder/include')
 move_file('openglRecorderWrapperIfaceAuto.h', 'recorder/include')
diff --git a/OpenGL/common/CMakeLists.txt b/OpenGL/common/CMakeLists.txt
index 2ef1ef9..274f3d7 100644
--- a/OpenGL/common/CMakeLists.txt
+++ b/OpenGL/common/CMakeLists.txt
@@ -7,23 +7,23 @@
 # ===================== end_copyright_notice ==============================
 
 set_source_files_properties(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/glIDs.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/glIDswitch.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/glDrivers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/glFunctions.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/glIDs.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/glIDswitch.h
   ${CMAKE_CURRENT_SOURCE_DIR}/glFunctions.cpp
   PROPERTIES GENERATED 1
 )
 
 add_library(OpenGL_common
-  include/glIDs.h
-  include/glIDswitch.h
   include/clientArrays.h
   include/eglArguments.h
   include/eglFunctions.h
   include/gitsFunctions.h
   include/glDrivers.h
   include/glFunctions.h
+  include/glIDs.h
+  include/glIDswitch.h
   include/glxArguments.h
   include/glxFunctions.h
   include/mapping.h
@@ -87,10 +87,10 @@ add_library(OpenGL_common
 )
 
 source_group("Generated Files" FILES
-  include/glIDs.h
-  include/glIDswitch.h
   include/glDrivers.h
   include/glFunctions.h
+  include/glIDs.h
+  include/glIDswitch.h
   glFunctions.cpp)
 
 target_link_libraries(OpenGL_common common)