diff --git a/src/AbstractObject.h b/src/AbstractObject.h
index befdbced6..e6d2a9158 100644
--- a/src/AbstractObject.h
+++ b/src/AbstractObject.h
@@ -36,9 +36,7 @@
 
 namespace Magnum {
 
-namespace Implementation {
-    struct DebugState;
-}
+namespace Implementation { struct DebugState; }
 
 /**
 @brief Base for all OpenGL objects
diff --git a/src/Implementation/DebugState.h b/src/Implementation/DebugState.h
index b6f1b2fae..3397c2063 100644
--- a/src/Implementation/DebugState.h
+++ b/src/Implementation/DebugState.h
@@ -34,11 +34,8 @@ namespace Magnum { namespace Implementation {
 struct DebugState {
     DebugState(Context& context);
 
-    typedef std::string(*GetLabelImplementation)(GLenum, GLuint);
-    GetLabelImplementation getLabelImplementation;
-
-    typedef void(*LabelImplementation)(GLenum, GLuint, const std::string&);
-    LabelImplementation labelImplementation;
+    std::string(*getLabelImplementation)(GLenum, GLuint);
+    void(*labelImplementation)(GLenum, GLuint, const std::string&);
 
     GLint maxLabelLength;
 };