diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
index e51ccfb7e..f471cd792 100644
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@@ -805,9 +805,6 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
 
         # GL library
         elseif(_component STREQUAL GL)
-            set_property(TARGET Magnum::${_component} APPEND PROPERTY
-                INTERFACE_INCLUDE_DIRECTORIES ${MAGNUM_INCLUDE_DIR}/MagnumExternal/OpenGL)
-
             if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES)
                 # If the GLVND library (CMake 3.11+) was found, link to the
                 # imported target. Otherwise (and also on all systems except
diff --git a/src/Magnum/GL/CMakeLists.txt b/src/Magnum/GL/CMakeLists.txt
index f36cbcc2f..ce5391e64 100644
--- a/src/Magnum/GL/CMakeLists.txt
+++ b/src/Magnum/GL/CMakeLists.txt
@@ -182,8 +182,7 @@ add_library(MagnumGLObjects OBJECT
 # be overriden with system ones or explicit (MagnumExternal/OpenGL/GLES2/gl2ext.h)
 # where only our headers will be used
 target_include_directories(MagnumGLObjects PUBLIC
-    $<TARGET_PROPERTY:Magnum,INTERFACE_INCLUDE_DIRECTORIES>
-    ${PROJECT_SOURCE_DIR}/src/MagnumExternal/OpenGL)
+    $<TARGET_PROPERTY:Magnum,INTERFACE_INCLUDE_DIRECTORIES>)
 if(NOT BUILD_STATIC)
     target_compile_definitions(MagnumGLObjects PRIVATE "MagnumGLObjects_EXPORTS" "FlextGL_EXPORTS")
 endif()
@@ -211,11 +210,6 @@ if(NOT BUILD_STATIC)
 elseif(BUILD_STATIC_PIC)
     set_target_properties(MagnumGL PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endif()
-# We can use both implicit include path (GLES2/gl2.h) where our headers can
-# be overriden with system ones or explicit (MagnumExternal/OpenGL/GLES2/gl2ext.h)
-# where only our headers will be used
-target_include_directories(MagnumGL PUBLIC
-    ${PROJECT_SOURCE_DIR}/src/MagnumExternal/OpenGL)
 target_link_libraries(MagnumGL PUBLIC Magnum)
 if(NOT TARGET_GLES OR TARGET_DESKTOP_GLES)
     # If the GLVND library (CMake 3.11+) was found, link to the imported
@@ -295,8 +289,6 @@ if(BUILD_TESTS)
         $<TARGET_OBJECTS:MagnumGLObjects>
         ${MagnumGL_FlextGL_SRCS}
         ${MagnumGL_GracefulAssert_SRCS})
-    target_include_directories(MagnumGLTestLib PUBLIC
-        ${PROJECT_SOURCE_DIR}/src/MagnumExternal/OpenGL)
     set_target_properties(MagnumGLTestLib PROPERTIES
         DEBUG_POSTFIX "-d"
         FOLDER "Magnum/GL")
diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h
index c7ac4cf53..d01dc6c91 100644
--- a/src/MagnumExternal/OpenGL/GL/flextGL.h
+++ b/src/MagnumExternal/OpenGL/GL/flextGL.h
@@ -29,6 +29,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
@@ -118,7 +119,6 @@ void flextGLInit(Magnum::GL::Context& context);
 
 /* Data types */
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h.template b/src/MagnumExternal/OpenGL/GL/flextGL.h.template
index 471ff1a12..d89c550ce 100644
--- a/src/MagnumExternal/OpenGL/GL/flextGL.h.template
+++ b/src/MagnumExternal/OpenGL/GL/flextGL.h.template
@@ -30,6 +30,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
diff --git a/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template b/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template
index ac895ef8b..311d4c825 100644
--- a/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template
+++ b/src/MagnumExternal/OpenGL/GLES2/Emscripten/flextGLEmscripten.h.template
@@ -27,6 +27,7 @@
 */
 
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h b/src/MagnumExternal/OpenGL/GLES2/flextGL.h
index 9d9914cd2..7cd1d0719 100644
--- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h
+++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h
@@ -29,6 +29,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
@@ -87,7 +88,6 @@ void flextGLInit(Magnum::GL::Context& context);
 
 /* Data types */
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template
index 751c3a1d2..a71ce31d4 100644
--- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template
+++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h.template
@@ -30,6 +30,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h
index db28e2484..c5355685f 100644
--- a/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h
+++ b/src/MagnumExternal/OpenGL/GLES2/flextGLEmscripten.h
@@ -26,6 +26,7 @@
 */
 
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
@@ -62,7 +63,6 @@ void flextGLInit(Magnum::GL::Context& context);
 
 /* Data types */
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h
index a860acacb..2c2f3a41f 100644
--- a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h
+++ b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h
@@ -29,6 +29,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
@@ -82,7 +83,6 @@ void flextGLInit(Magnum::GL::Context& context);
 
 /* Data types */
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h.template b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h.template
index 7f5fc9683..c112ddd89 100644
--- a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h.template
+++ b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h.template
@@ -30,6 +30,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
diff --git a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template
index d0c9e79c4..2b98375b7 100644
--- a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template
+++ b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template
@@ -27,6 +27,7 @@
 */
 
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h
index a55138573..c15a5c66b 100644
--- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h
+++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h
@@ -29,6 +29,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
@@ -94,7 +95,6 @@ void flextGLInit(Magnum::GL::Context& context);
 
 /* Data types */
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template
index a16222d75..de3e5ec5f 100644
--- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template
+++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template
@@ -30,6 +30,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h
index 66119f11c..fab556de2 100644
--- a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h
+++ b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h
@@ -26,6 +26,7 @@
 */
 
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
@@ -68,7 +69,6 @@ void flextGLInit(Magnum::GL::Context& context);
 
 /* Data types */
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h
index de3dd34ea..0fcc783c7 100644
--- a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h
+++ b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h
@@ -29,6 +29,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */
 
@@ -86,7 +87,6 @@ void flextGLInit(Magnum::GL::Context& context);
 
 /* Data types */
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template
index a12bc1afb..880a9e98f 100644
--- a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template
+++ b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template
@@ -30,6 +30,7 @@
 
 #include "Magnum/configure.h"
 #include "Magnum/GL/GL.h"
+#include "MagnumExternal/OpenGL/KHR/khrplatform.h"
 
 /* Defensive include guards */