diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
index c25cc4c56c69..786ee5b308f3 100644
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -3112,3 +3112,5 @@ void MediaFormatReader::OnFirstDemuxFailed(TrackInfo::TrackType aType,
 }  // namespace mozilla
 
 #undef NS_DispatchToMainThread
+#undef LOGV
+#undef LOG
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index 59ad832f142d..d1ff5efdb3e0 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -172,10 +172,6 @@ class nsMainThreadPtrHolder<
 
 namespace mozilla {
 
-#ifdef LOG
-#  undef LOG
-#endif
-
 LazyLogModule gMediaManagerLog("MediaManager");
 #define LOG(...) MOZ_LOG(gMediaManagerLog, LogLevel::Debug, (__VA_ARGS__))
 
@@ -4656,4 +4652,6 @@ void GetUserMediaWindowListener::NotifyChrome() {
       }));
 }
 
+#undef LOG
+
 }  // namespace mozilla
diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
index d12903864bbb..5acf1a3d523d 100644
--- a/dom/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -40,10 +40,6 @@
 #include "nsProxyRelease.h"
 #include "nsTArray.h"
 
-#ifdef LOG
-#  undef LOG
-#endif
-
 mozilla::LazyLogModule gMediaRecorderLog("MediaRecorder");
 #define LOG(type, msg) MOZ_LOG(gMediaRecorderLog, type, msg)
 
@@ -1643,3 +1639,5 @@ StaticRefPtr<MediaRecorderReporter> MediaRecorderReporter::sUniqueInstance;
 
 }  // namespace dom
 }  // namespace mozilla
+
+#undef LOG
diff --git a/dom/media/encoder/MediaEncoder.cpp b/dom/media/encoder/MediaEncoder.cpp
index eb4e60705d15..c140250b0ddf 100644
--- a/dom/media/encoder/MediaEncoder.cpp
+++ b/dom/media/encoder/MediaEncoder.cpp
@@ -39,10 +39,6 @@
 #  include "WebMWriter.h"
 #endif
 
-#ifdef LOG
-#  undef LOG
-#endif
-
 mozilla::LazyLogModule gMediaEncoderLog("MediaEncoder");
 #define LOG(type, msg) MOZ_LOG(gMediaEncoderLog, type, msg)
 
@@ -1034,3 +1030,5 @@ void MediaEncoder::SetVideoKeyFrameInterval(int32_t aVideoKeyFrameInterval) {
 }
 
 }  // namespace mozilla
+
+#undef LOG
diff --git a/dom/media/encoder/OpusTrackEncoder.cpp b/dom/media/encoder/OpusTrackEncoder.cpp
index 29984d5b57c5..dd037dbc83bc 100644
--- a/dom/media/encoder/OpusTrackEncoder.cpp
+++ b/dom/media/encoder/OpusTrackEncoder.cpp
@@ -10,7 +10,6 @@
 
 #include <opus/opus.h>
 
-#undef LOG
 #define LOG(args, ...)
 
 namespace mozilla {
@@ -434,3 +433,5 @@ nsresult OpusTrackEncoder::GetEncodedTrack(
 }
 
 }  // namespace mozilla
+
+#undef LOG
diff --git a/dom/media/encoder/TrackEncoder.cpp b/dom/media/encoder/TrackEncoder.cpp
index 8a014cf7b9dc..3d0484aa2dea 100644
--- a/dom/media/encoder/TrackEncoder.cpp
+++ b/dom/media/encoder/TrackEncoder.cpp
@@ -759,3 +759,5 @@ void VideoTrackEncoder::SetKeyFrameInterval(int32_t aKeyFrameInterval) {
 }
 
 }  // namespace mozilla
+
+#undef TRACK_LOG
diff --git a/dom/media/encoder/VP8TrackEncoder.cpp b/dom/media/encoder/VP8TrackEncoder.cpp
index 98c86696e230..aa9b102a5c5d 100644
--- a/dom/media/encoder/VP8TrackEncoder.cpp
+++ b/dom/media/encoder/VP8TrackEncoder.cpp
@@ -570,3 +570,5 @@ nsresult VP8TrackEncoder::GetEncodedTrack(
 }
 
 }  // namespace mozilla
+
+#undef VP8LOG
diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp
index 52b3ab79879f..cd95925b417f 100644
--- a/dom/media/ogg/OggCodecState.cpp
+++ b/dom/media/ogg/OggCodecState.cpp
@@ -1675,4 +1675,6 @@ bool SkeletonState::DecodeHeader(OggPacketPtr aPacket) {
   return true;
 }
 
+#undef LOG
+
 }  // namespace mozilla
diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp
index f1446750f515..114ac067fda5 100644
--- a/dom/media/ogg/OggDemuxer.cpp
+++ b/dom/media/ogg/OggDemuxer.cpp
@@ -1893,5 +1893,5 @@ nsresult OggDemuxer::SeekBisection(TrackInfo::TrackType aType, int64_t aTarget,
 }
 
 #undef OGG_DEBUG
-#undef SEEK_DEBUG
+#undef SEEK_LOG
 }  // namespace mozilla
diff --git a/dom/media/ogg/OggWriter.cpp b/dom/media/ogg/OggWriter.cpp
index bbe1414d5f86..35247fc6858c 100644
--- a/dom/media/ogg/OggWriter.cpp
+++ b/dom/media/ogg/OggWriter.cpp
@@ -6,7 +6,6 @@
 #include "prtime.h"
 #include "GeckoProfiler.h"
 
-#undef LOG
 #define LOG(args, ...)
 
 namespace mozilla {
@@ -195,3 +194,5 @@ nsresult OggWriter::SetMetadata(
 }
 
 }  // namespace mozilla
+
+#undef LOG
diff --git a/dom/media/ogg/OpusParser.cpp b/dom/media/ogg/OpusParser.cpp
index c0436c4c98c4..918888ea8c8a 100644
--- a/dom/media/ogg/OpusParser.cpp
+++ b/dom/media/ogg/OpusParser.cpp
@@ -212,4 +212,6 @@ bool OpusParser::IsValidMapping2ChannelsCount(uint8_t aChannels) {
   return val == valInt || valInt * valInt + 2 == aChannels;
 }
 
+#undef OPUS_LOG
+
 }  // namespace mozilla
diff --git a/dom/media/webm/WebMDemuxer.cpp b/dom/media/webm/WebMDemuxer.cpp
index dffe06416121..18336654256f 100644
--- a/dom/media/webm/WebMDemuxer.cpp
+++ b/dom/media/webm/WebMDemuxer.cpp
@@ -1259,6 +1259,6 @@ int64_t WebMTrackDemuxer::GetEvictionOffset(const TimeUnit& aTime) {
 
   return offset;
 }
+}  // namespace mozilla
 
 #undef WEBM_DEBUG
-}  // namespace mozilla