diff --git a/src/AbstractObject.h b/src/AbstractObject.h
index e6d2a9158..33b0f26fc 100644
--- a/src/AbstractObject.h
+++ b/src/AbstractObject.h
@@ -42,8 +42,7 @@ namespace Implementation { struct DebugState; }
 @brief Base for all OpenGL objects
 */
 class MAGNUM_EXPORT AbstractObject {
-    friend class Context;
-    friend class Implementation::DebugState;
+    friend struct Implementation::DebugState;
 
     public:
         /**
diff --git a/src/DebugMessage.h b/src/DebugMessage.h
index d91cff627..4f9804390 100644
--- a/src/DebugMessage.h
+++ b/src/DebugMessage.h
@@ -69,7 +69,7 @@ With default callback the messages will be printed on standard output:
         Hello from OpenGL command stream!
 */
 class MAGNUM_EXPORT DebugMessage {
-    friend class Implementation::DebugState;
+    friend struct Implementation::DebugState;
 
     public:
         /**