diff --git a/src/Magnum.h b/src/Magnum.h
index fbd020fbb..e5fb3e8ab 100644
--- a/src/Magnum.h
+++ b/src/Magnum.h
@@ -589,8 +589,9 @@ typedef ImageReference<1> ImageReference1D;
 typedef ImageReference<2> ImageReference2D;
 typedef ImageReference<3> ImageReference3D;
 
+#ifndef CORRADE_GCC45_COMPATIBILITY
 enum class MeshPrimitive: GLenum;
-
+#endif
 class Mesh;
 class MeshView;
 
diff --git a/src/Trade/MeshData2D.h b/src/Trade/MeshData2D.h
index a064977cb..25f901687 100644
--- a/src/Trade/MeshData2D.h
+++ b/src/Trade/MeshData2D.h
@@ -34,6 +34,10 @@
 
 #include "magnumVisibility.h"
 
+#ifdef CORRADE_GCC45_COMPATIBILITY
+#include "Mesh.h"
+#endif
+
 namespace Magnum { namespace Trade {
 
 /**
diff --git a/src/Trade/MeshData3D.h b/src/Trade/MeshData3D.h
index d1440affb..a1821dfa6 100644
--- a/src/Trade/MeshData3D.h
+++ b/src/Trade/MeshData3D.h
@@ -34,6 +34,10 @@
 
 #include "magnumVisibility.h"
 
+#ifdef CORRADE_GCC45_COMPATIBILITY
+#include "Mesh.h"
+#endif
+
 namespace Magnum { namespace Trade {
 
 /**