diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h
index e64fdfa72..792ffa182 100644
--- a/src/AbstractFramebuffer.h
+++ b/src/AbstractFramebuffer.h
@@ -33,6 +33,10 @@
 #include "Math/Geometry/Rectangle.h"
 #include "Buffer.h"
 
+#ifdef CORRADE_GCC45_COMPATIBILITY
+#include "ImageFormat.h"
+#endif
+
 namespace Magnum {
 
 /**
diff --git a/src/AbstractImage.h b/src/AbstractImage.h
index aef3c71ec..65784d872 100644
--- a/src/AbstractImage.h
+++ b/src/AbstractImage.h
@@ -33,6 +33,10 @@
 #include "Magnum.h"
 #include "magnumVisibility.h"
 
+#ifdef CORRADE_GCC45_COMPATIBILITY
+#include "ImageFormat.h"
+#endif
+
 namespace Magnum {
 
 /**
diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h
index fc2358124..44292becc 100644
--- a/src/AbstractTexture.h
+++ b/src/AbstractTexture.h
@@ -35,6 +35,11 @@
 #include "Color.h"
 #include "Sampler.h"
 
+#ifdef CORRADE_GCC45_COMPATIBILITY
+#include "ImageFormat.h"
+#include "TextureFormat.h"
+#endif
+
 namespace Magnum {
 
 /**
diff --git a/src/Magnum.h b/src/Magnum.h
index 016ff51ea..87548483e 100644
--- a/src/Magnum.h
+++ b/src/Magnum.h
@@ -357,8 +357,10 @@ typedef BufferImage<3> BufferImage3D;
 
 #ifndef MAGNUM_TARGET_GLES
 class BufferTexture;
+#ifndef CORRADE_GCC45_COMPATIBILITY
 enum class BufferTextureFormat: GLenum;
 #endif
+#endif
 
 template<class T = Float> class Color3;
 template<class T = Float> class Color4;
@@ -385,8 +387,10 @@ typedef Image<1> Image1D;
 typedef Image<2> Image2D;
 typedef Image<3> Image3D;
 
+#ifndef CORRADE_GCC45_COMPATIBILITY
 enum class ImageFormat: GLenum;
 enum class ImageType: GLenum;
+#endif
 
 template<UnsignedInt> class ImageWrapper;
 typedef ImageWrapper<1> ImageWrapper1D;
@@ -401,7 +405,9 @@ class SampleQuery;
 class TimeQuery;
 
 class Renderbuffer;
+#ifndef CORRADE_GCC45_COMPATIBILITY
 enum class RenderbufferFormat: GLenum;
+#endif
 
 #ifndef CORRADE_GCC45_COMPATIBILITY
 enum class ResourceState: UnsignedByte;
@@ -422,7 +428,9 @@ typedef Texture<1> Texture1D;
 typedef Texture<2> Texture2D;
 typedef Texture<3> Texture3D;
 
+#ifndef CORRADE_GCC45_COMPATIBILITY
 enum class TextureFormat: GLenum;
+#endif
 
 class Timeline;
 #endif
diff --git a/src/Renderbuffer.h b/src/Renderbuffer.h
index f35ac0bac..cd41fb3fd 100644
--- a/src/Renderbuffer.h
+++ b/src/Renderbuffer.h
@@ -32,6 +32,10 @@
 #include "OpenGL.h"
 #include "magnumVisibility.h"
 
+#ifdef CORRADE_GCC45_COMPATIBILITY
+#include "RenderbufferFormat.h"
+#endif
+
 namespace Magnum {
 
 /**