diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index ffe6f5b2..1cc06fe9 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -236,8 +236,8 @@ list(APPEND CELESTIA_SOURCES
         ${CELESTIA_SRC_DIR}/celengine/galaxy.cpp
         ${CELESTIA_SRC_DIR}/celengine/galaxy.h
         ${CELESTIA_SRC_DIR}/celengine/geometry.h
-        ${CELESTIA_SRC_DIR}/celengine/gl.cpp
-        ${CELESTIA_SRC_DIR}/celengine/gl.h
+        ${CELESTIA_SRC_DIR}/celengine/glsupport.cpp
+        ${CELESTIA_SRC_DIR}/celengine/glsupport.h
         ${CELESTIA_SRC_DIR}/celengine/glmarker.cpp
         ${CELESTIA_SRC_DIR}/celengine/globular.cpp
         ${CELESTIA_SRC_DIR}/celengine/globular.h
diff --git a/app/src/main/cpp/CelestiaAppCore.cpp b/app/src/main/cpp/CelestiaAppCore.cpp
index bd3ad6e4..4991e589 100644
--- a/app/src/main/cpp/CelestiaAppCore.cpp
+++ b/app/src/main/cpp/CelestiaAppCore.cpp
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include <celestia/celestiacore.h>
-#include <celengine/gl.h>
+#include <celengine/glsupport.h>
 #include <celestia/helper.h>
 #include <celutil/util.h>
 #include <celutil/gettext.h>
@@ -195,7 +195,7 @@ class AppCoreProgressWatcher: public ProgressNotifier
 extern "C"
 JNIEXPORT jboolean JNICALL
 Java_space_celestia_mobilecelestia_core_CelestiaAppCore_c_1initGL(JNIEnv *env, jclass clazz) {
-    glInit();
+    celestia::gl::init();
     return JNI_TRUE;
 }