diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt
index 527370a..16661e6 100644
--- a/freeglut/freeglut/CMakeLists.txt
+++ b/freeglut/freeglut/CMakeLists.txt
@@ -131,8 +131,8 @@ ELSEIF(ANDROID OR BLACKBERRY)
         LIST(APPEND FREEGLUT_SRCS
             src/android/native_app_glue/android_native_app_glue.c
             src/android/native_app_glue/android_native_app_glue.h
-            src/android/fg_init_android.c
             src/android/fg_internal_android.h
+            src/android/fg_init_android.c
             src/android/fg_input_devices_android.c
             src/android/fg_main_android.c
             src/android/fg_main_android.h
@@ -142,8 +142,8 @@ ELSEIF(ANDROID OR BLACKBERRY)
         )
     ELSE()
         LIST(APPEND FREEGLUT_SRCS
-            src/blackberry/fg_init_blackberry.c
             src/blackberry/fg_internal_blackberry.h
+            src/blackberry/fg_init_blackberry.c
             src/x11/fg_input_devices_x11.c
             src/blackberry/fg_main_blackberry.c
             src/blackberry/fg_state_blackberry.c
diff --git a/freeglut/freeglut/src/blackberry/fg_window_blackberry.c b/freeglut/freeglut/src/blackberry/fg_window_blackberry.c
index ff0c08f..8c1a121 100644
--- a/freeglut/freeglut/src/blackberry/fg_window_blackberry.c
+++ b/freeglut/freeglut/src/blackberry/fg_window_blackberry.c
@@ -64,7 +64,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
   fgDisplay.pDisplay.single_native_window = sWindow;
 
   /* Set window properties */
-  int screenFormat = SCREEN_FORMAT_RGBA8888;
+  int screenFormat = SCREEN_FORMAT_RGBA8888; //XXX Should this be determined by config?
 #ifdef GL_ES_VERSION_2_0
   int screenUsage = SCREEN_USAGE_OPENGL_ES2;
 #elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1