diff --git a/src/input/r_mpeg.cpp b/src/input/r_mpeg_es.cpp
similarity index 99%
rename from src/input/r_mpeg.cpp
rename to src/input/r_mpeg_es.cpp
index 4c3aea7bc..cdc07a0cc 100644
--- a/src/input/r_mpeg.cpp
+++ b/src/input/r_mpeg_es.cpp
@@ -21,7 +21,7 @@
 #include "common.h"
 #include "error.h"
 #include "M2VParser.h"
-#include "r_mpeg.h"
+#include "r_mpeg_es.h"
 #include "smart_pointers.h"
 #include "output_control.h"
 #include "p_video.h"
diff --git a/src/input/r_mpeg.h b/src/input/r_mpeg_es.h
similarity index 94%
rename from src/input/r_mpeg.h
rename to src/input/r_mpeg_es.h
index 4f0c86ebc..a9e449405 100644
--- a/src/input/r_mpeg.h
+++ b/src/input/r_mpeg_es.h
@@ -13,8 +13,8 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#ifndef __R_MPEG_H
-#define __R_MPEG_H
+#ifndef __R_MPEG_ES_H
+#define __R_MPEG_ES_H
 
 #include "os.h"
 
@@ -51,4 +51,4 @@ public:
   static int probe_file(mm_io_c *io, int64_t size);
 };
 
-#endif // __R_MPEG_H
+#endif // __R_MPEG_ES_H
diff --git a/src/merge/output_control.cpp b/src/merge/output_control.cpp
index 8d0b2abd5..776956c6b 100644
--- a/src/merge/output_control.cpp
+++ b/src/merge/output_control.cpp
@@ -81,7 +81,7 @@
 #include "r_flv.h"
 #include "r_matroska.h"
 #include "r_mp3.h"
-#include "r_mpeg.h"
+#include "r_mpeg_es.h"
 #include "r_mpeg_ps.h"
 #include "r_mpeg_ts.h"
 #include "r_ogm.h"