diff --git a/src/Magnum/Audio/Audio.h b/src/Magnum/Audio/Audio.h
index d210096f5..6e9e8f1bb 100644
--- a/src/Magnum/Audio/Audio.h
+++ b/src/Magnum/Audio/Audio.h
@@ -29,7 +29,7 @@
  * @brief Forward declarations for the @ref Magnum::Audio namespace
  */
 
-#include <Magnum/Magnum.h>
+#include "Magnum/Types.h"
 
 #ifndef DOXYGEN_GENERATING_OUTPUT
 typedef int ALenum;
diff --git a/src/Magnum/Audio/Context.h b/src/Magnum/Audio/Context.h
index df87a83d6..0d03ff6f9 100644
--- a/src/Magnum/Audio/Context.h
+++ b/src/Magnum/Audio/Context.h
@@ -27,26 +27,20 @@
 */
 
 /** @file
- * @brief Class @ref Magnum::Audio::Context
+ * @brief Class @ref Magnum::Audio::Context, macro @ref MAGNUM_ASSERT_AUDIO_EXTENSION_SUPPORTED()
  */
 
 #include <string>
 #include <vector>
-#include <array>
 #include <bitset>
 #include <al.h>
-
+#include <alc.h>
 #include <Corrade/Containers/EnumSet.h>
+#include <Corrade/Utility/Debug.h>
 
-#include "Magnum/Audio/Audio.h"
-#include "Magnum/Audio/Buffer.h"
-#include "Magnum/Audio/Extensions.h"
+#include "Magnum/Magnum.h"
 #include "Magnum/Audio/visibility.h"
-
-#ifndef DOXYGEN_GENERATING_OUTPUT
-typedef struct ALCdevice_struct ALCdevice;
-typedef struct ALCcontext_struct ALCcontext;
-#endif
+#include "MagnumExternal/OpenAL/extensions.h"
 
 namespace Magnum { namespace Audio {
 
diff --git a/src/Magnum/Audio/al-info.cpp b/src/Magnum/Audio/al-info.cpp
index 007304a76..2c8c0c687 100644
--- a/src/Magnum/Audio/al-info.cpp
+++ b/src/Magnum/Audio/al-info.cpp
@@ -25,7 +25,6 @@
 
 #include <Corrade/Utility/Arguments.h>
 
-#include "Magnum/Magnum.h"
 #include "Magnum/Audio/Context.h"
 
 namespace Magnum {