diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cf7d603..4ae889f4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -97,7 +97,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL3=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON
           make -j2
 
       - name: Test (headless)
@@ -124,7 +124,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_GLES2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)
@@ -135,7 +135,7 @@ jobs:
       - name: Test (Xvfb)
         run: |
           cd bin/Linux
-          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest gles2
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
   win32:
     runs-on: ubuntu-20.04
diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
index 686b0d29..278622ba 100644
--- a/source/Irrlicht/CMakeLists.txt
+++ b/source/Irrlicht/CMakeLists.txt
@@ -260,7 +260,7 @@ endif()
 if(ENABLE_GLES2)
 	find_package(OpenGLES2 REQUIRED)
 endif()
-if(ENABLE_OPENGL)
+if(ENABLE_OPENGL OR ENABLE_OPENGL3)
 	set(OpenGL_GL_PREFERENCE "LEGACY")
 	find_package(OpenGL REQUIRED)
 endif()
diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h
index 79b28007..ebe0a193 100644
--- a/source/Irrlicht/COpenGLCoreCacheHandler.h
+++ b/source/Irrlicht/COpenGLCoreCacheHandler.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
 
 
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
-
 #include "SMaterial.h"
 #include "ITexture.h"
 
@@ -643,4 +641,3 @@ protected:
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COpenGLCoreFeature.h b/source/Irrlicht/COpenGLCoreFeature.h
index fe86f955..fa930bd0 100644
--- a/source/Irrlicht/COpenGLCoreFeature.h
+++ b/source/Irrlicht/COpenGLCoreFeature.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_FEATURE_H_INCLUDED__
 
 
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
-
 #include "irrTypes.h"
 
 namespace irr
@@ -37,4 +35,3 @@ public:
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COpenGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h
index f893c174..f96fb87d 100644
--- a/source/Irrlicht/COpenGLCoreRenderTarget.h
+++ b/source/Irrlicht/COpenGLCoreRenderTarget.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
 
 
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
-
 #include "IRenderTarget.h"
 
 #ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS
@@ -400,4 +398,3 @@ protected:
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h
index 2ad8af12..15a827e9 100644
--- a/source/Irrlicht/COpenGLCoreTexture.h
+++ b/source/Irrlicht/COpenGLCoreTexture.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_TEXTURE_H_INCLUDED__
 
 
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
-
 #include "irrArray.h"
 #include "SMaterialLayer.h"
 #include "ITexture.h"
@@ -666,4 +664,3 @@ protected:
 }
 
 #endif
-#endif
diff --git a/source/Irrlicht/CSDLManager.cpp b/source/Irrlicht/CSDLManager.cpp
index 3132b60a..b8c61a4d 100644
--- a/source/Irrlicht/CSDLManager.cpp
+++ b/source/Irrlicht/CSDLManager.cpp
@@ -4,7 +4,7 @@
 
 #include "CSDLManager.h"
 
-#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && defined(_IRR_COMPILE_WITH_OPENGL_)
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
 
 #include "CIrrDeviceSDL.h"
 #include "COpenGLCommon.h"
@@ -34,8 +34,6 @@ const SExposedVideoData& CSDLManager::getContext() const
 
 bool CSDLManager::activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero)
 {
-	// unclear if this is still needed:
-	glFrontFace(GL_CW);
 	return true;
 }
 
diff --git a/source/Irrlicht/CSDLManager.h b/source/Irrlicht/CSDLManager.h
index 3d9648c6..f1472424 100644
--- a/source/Irrlicht/CSDLManager.h
+++ b/source/Irrlicht/CSDLManager.h
@@ -6,7 +6,7 @@
 #define __C_SDL_MANAGER_H_INCLUDED__
 
 
-#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && defined(_IRR_COMPILE_WITH_OPENGL_)
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
 
 #include "IContextManager.h"