diff --git a/aegisub/libmedia/audio/avs_audio.cpp b/aegisub/libmedia/audio/avs_audio.cpp
index 82ca5f35f..035a420dc 100644
--- a/aegisub/libmedia/audio/avs_audio.cpp
+++ b/aegisub/libmedia/audio/avs_audio.cpp
@@ -52,6 +52,8 @@
 #include "standard_paths.h"
 #include "utils.h"
 
+namespace media {
+
 /// @brief Constructor 
 /// @param _filename 
 ///
@@ -168,3 +170,5 @@ void AvisynthAudioProvider::GetAudio(void *buf, int64_t start, int64_t count) co
 	}
 }
 #endif
+
+} // namespace
diff --git a/aegisub/libmedia/audio/avs_audio.h b/aegisub/libmedia/audio/avs_audio.h
index 31836ec87..9c7fb0d51 100644
--- a/aegisub/libmedia/audio/avs_audio.h
+++ b/aegisub/libmedia/audio/avs_audio.h
@@ -39,6 +39,8 @@
 #include "avisynth_wrap.h"
 
 
+namespace media {
+
 /// DOCME
 /// @class AvisynthAudioProvider
 /// @brief DOCME
@@ -66,3 +68,6 @@ public:
 	void GetWaveForm(int *min,int *peak,int64_t start,int w,int h,int samples,float scale);
 };
 #endif
+
+} // namespace
+
diff --git a/aegisub/libmedia/audio/dummy.h b/aegisub/libmedia/audio/dummy.h
index 6448412eb..9b6a4c318 100644
--- a/aegisub/libmedia/audio/dummy.h
+++ b/aegisub/libmedia/audio/dummy.h
@@ -36,6 +36,8 @@
 
 #include "include/aegisub/audio_provider.h"
 
+namespace media {
+
 /// DOCME
 /// @class DummyAudioProvider
 /// @brief DOCME
@@ -52,3 +54,6 @@ public:
 	bool AreSamplesNativeEndian() const { return true; }
 	void GetAudio(void *buf, int64_t start, int64_t count) const;
 };
+
+} // namespace
+
diff --git a/aegisub/libmedia/audio/dummy_audio.cpp b/aegisub/libmedia/audio/dummy_audio.cpp
index 08b1c5ce7..d02e74b4d 100644
--- a/aegisub/libmedia/audio/dummy_audio.cpp
+++ b/aegisub/libmedia/audio/dummy_audio.cpp
@@ -40,6 +40,8 @@
 #include "utils.h"
 
 
+namespace media {
+
 /// @brief Constructor 
 /// @param dur_ms 
 /// @param _noise 
@@ -74,3 +76,6 @@ void DummyAudioProvider::GetAudio(void *buf, int64_t start, int64_t count) const
 			*workbuf++ = 0;
 	}
 }
+
+} // namespace
+
diff --git a/aegisub/libmedia/audio/ffms_audio.cpp b/aegisub/libmedia/audio/ffms_audio.cpp
index 1ef123570..8bf9ed984 100644
--- a/aegisub/libmedia/audio/ffms_audio.cpp
+++ b/aegisub/libmedia/audio/ffms_audio.cpp
@@ -221,3 +221,5 @@ void Audio::GetAudio(void *Buf, int64_t Start, int64_t Count) const {
 }
 	} // namespace ffms
 } // namespace media
+
+
diff --git a/aegisub/libmedia/audio/pcm.cpp b/aegisub/libmedia/audio/pcm.cpp
index ba1df2c65..e748b87dd 100644
--- a/aegisub/libmedia/audio/pcm.cpp
+++ b/aegisub/libmedia/audio/pcm.cpp
@@ -59,6 +59,8 @@
 #include "utils.h"
 
 
+namespace media {
+
 /// @brief DOCME
 /// @param filename 
 ///
@@ -629,3 +631,6 @@ AudioProvider *CreatePCMAudioProvider(const wxString &filename)
 		throw AudioOpenError(msg);
 	}
 }
+
+} // namespace
+
diff --git a/aegisub/libmedia/audio/pcm.h b/aegisub/libmedia/audio/pcm.h
index e81c80f65..bbf9ef767 100644
--- a/aegisub/libmedia/audio/pcm.h
+++ b/aegisub/libmedia/audio/pcm.h
@@ -48,6 +48,8 @@
 #include "include/aegisub/audio_provider.h"
 
 
+namespace media {
+
 /// DOCME
 /// @class PCMAudioProvider
 /// @brief DOCME
@@ -113,3 +115,6 @@ public:
 
 // Construct the right PCM audio provider (if any) for the file
 AudioProvider *CreatePCMAudioProvider(const wxString &filename);
+
+} // namespace
+