diff --git a/src/Magnum/AbstractFramebuffer.cpp b/src/Magnum/AbstractFramebuffer.cpp
index 28855de2b..03219ad3d 100644
--- a/src/Magnum/AbstractFramebuffer.cpp
+++ b/src/Magnum/AbstractFramebuffer.cpp
@@ -24,7 +24,9 @@
 
 #include "AbstractFramebuffer.h"
 
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"
 #include "Magnum/Image.h"
diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp
index df6d110fd..128188d0a 100644
--- a/src/Magnum/AbstractTexture.cpp
+++ b/src/Magnum/AbstractTexture.cpp
@@ -24,7 +24,9 @@
 
 #include "AbstractTexture.h"
 
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"
diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp
index f5e29bfbc..d13f7b848 100644
--- a/src/Magnum/Context.cpp
+++ b/src/Magnum/Context.cpp
@@ -33,7 +33,9 @@
 #include "Magnum/AbstractShaderProgram.h"
 #include "Magnum/AbstractTexture.h"
 #include "Magnum/Buffer.h"
+#ifndef MAGNUM_TARGET_GLES
 #include "Magnum/BufferTexture.h"
+#endif
 #include "Magnum/DefaultFramebuffer.h"
 #include "Magnum/Extensions.h"
 #include "Magnum/Framebuffer.h"
diff --git a/src/Magnum/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp
index ebbd5dcdd..cc29b484e 100644
--- a/src/Magnum/Framebuffer.cpp
+++ b/src/Magnum/Framebuffer.cpp
@@ -24,7 +24,11 @@
 
 #include "Framebuffer.h"
 
+#include <Corrade/Containers/Array.h>
+
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"
 #include "Magnum/Image.h"
diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp
index 0dd5e9808..991705010 100644
--- a/src/Magnum/Platform/magnum-info.cpp
+++ b/src/Magnum/Platform/magnum-info.cpp
@@ -31,7 +31,9 @@
 
 #include "Magnum/AbstractShaderProgram.h"
 #include "Magnum/Buffer.h"
+#ifndef MAGNUM_TARGET_GLES
 #include "Magnum/BufferTexture.h"
+#endif
 #include "Magnum/Context.h"
 #include "Magnum/DebugMessage.h"
 #include "Magnum/Extensions.h"
diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp
index 880a18fee..c3e382ad3 100644
--- a/src/Magnum/Test/CubeMapTextureGLTest.cpp
+++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp
@@ -24,7 +24,10 @@
 
 #include <Corrade/TestSuite/Compare/Container.h>
 
+#include "Magnum/configure.h"
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Image.h"
 #include "Magnum/CubeMapTexture.h"
diff --git a/src/Magnum/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp
index 9a83b82bf..75f692630 100644
--- a/src/Magnum/Test/FramebufferGLTest.cpp
+++ b/src/Magnum/Test/FramebufferGLTest.cpp
@@ -22,7 +22,10 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#include "Magnum/configure.h"
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Context.h"
 #include "Magnum/Extensions.h"
diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp
index d61ee20b8..0ee243dc3 100644
--- a/src/Magnum/Test/TextureGLTest.cpp
+++ b/src/Magnum/Test/TextureGLTest.cpp
@@ -24,7 +24,10 @@
 
 #include <Corrade/TestSuite/Compare/Container.h>
 
+#include "Magnum/configure.h"
+#ifndef MAGNUM_TARGET_GLES2
 #include "Magnum/BufferImage.h"
+#endif
 #include "Magnum/ColorFormat.h"
 #include "Magnum/Image.h"
 #include "Magnum/Texture.h"
diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp
index c780714d7..8f301756d 100644
--- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp
+++ b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp
@@ -35,10 +35,13 @@
 
 #ifdef MAGNUM_TARGET_GLES
 #include <algorithm>
-#include "Math/Swizzle.h"
-#include "Math/Vector4.h"
-#include "Context.h"
-#include "Extensions.h"
+#include "Magnum/Math/Swizzle.h"
+#include "Magnum/Math/Vector4.h"
+#endif
+
+#ifdef MAGNUM_TARGET_GLES2
+#include "Magnum/Context.h"
+#include "Magnum/Extensions.h"
 #endif
 
 namespace Magnum { namespace Trade {