diff --git a/src/Magnum/GL/GL.h b/src/Magnum/GL/GL.h
index 15f996241..1352331c3 100644
--- a/src/Magnum/GL/GL.h
+++ b/src/Magnum/GL/GL.h
@@ -34,6 +34,7 @@
 #ifndef DOXYGEN_GENERATING_OUTPUT
 typedef int GLint; /* Needed for sampler enums */
 typedef unsigned int GLenum; /* Needed for *Format and *Type enums */
+typedef unsigned int GLuint; /* Needed by Implementation/State.h */
 #endif
 
 namespace Magnum { namespace GL {
diff --git a/src/Magnum/GL/Implementation/State.h b/src/Magnum/GL/Implementation/State.h
index 362813895..3068ad88a 100644
--- a/src/Magnum/GL/Implementation/State.h
+++ b/src/Magnum/GL/Implementation/State.h
@@ -27,8 +27,8 @@
 
 #include <memory>
 
+#include "Magnum/Magnum.h"
 #include "Magnum/GL/GL.h"
-#include "Magnum/GL/OpenGL.h"
 
 namespace Magnum { namespace GL { namespace Implementation {