diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c
index ed6e1b61ad..0a07a9647e 100644
--- a/libavcodec/av1_parser.c
+++ b/libavcodec/av1_parser.c
@@ -24,9 +24,9 @@
 #include "libavutil/avassert.h"
 
 #include "av1_parse.h"
+#include "avcodec.h"
 #include "cbs.h"
 #include "cbs_av1.h"
-#include "parser.h"
 
 typedef struct AV1ParseContext {
     CodedBitstreamContext *cbc;
diff --git a/libavcodec/cook_parser.c b/libavcodec/cook_parser.c
index 0d9473845e..404f611cf4 100644
--- a/libavcodec/cook_parser.c
+++ b/libavcodec/cook_parser.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 
 #include "libavutil/intreadwrite.h"
-#include "parser.h"
+#include "avcodec.h"
 
 typedef struct CookParseContext {
     int duration;
diff --git a/libavcodec/dvaudio_parser.c b/libavcodec/dvaudio_parser.c
index ef6bd45582..e99ffc0517 100644
--- a/libavcodec/dvaudio_parser.c
+++ b/libavcodec/dvaudio_parser.c
@@ -23,7 +23,7 @@
  * Determines the duration for each packet.
  */
 
-#include "parser.h"
+#include "avcodec.h"
 #include "dvaudio.h"
 
 static int dvaudio_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
diff --git a/libavcodec/dvd_nav_parser.c b/libavcodec/dvd_nav_parser.c
index 3ea4cd1ef5..3005a10572 100644
--- a/libavcodec/dvd_nav_parser.c
+++ b/libavcodec/dvd_nav_parser.c
@@ -18,9 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
 #include "avcodec.h"
-#include "get_bits.h"
-#include "parser.h"
+#include "libavutil/intreadwrite.h"
 
 #define PCI_SIZE  980
 #define DSI_SIZE 1018
diff --git a/libavcodec/vp3_parser.c b/libavcodec/vp3_parser.c
index 1bed43e779..e8bfebdc39 100644
--- a/libavcodec/vp3_parser.c
+++ b/libavcodec/vp3_parser.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "parser.h"
+#include "avcodec.h"
 
 static int parse(AVCodecParserContext *s,
                  AVCodecContext *avctx,
diff --git a/libavcodec/vp9_parser.c b/libavcodec/vp9_parser.c
index ffcb93505f..72df554da5 100644
--- a/libavcodec/vp9_parser.c
+++ b/libavcodec/vp9_parser.c
@@ -21,9 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-#include "libavcodec/get_bits.h"
-#include "parser.h"
+#include "avcodec.h"
+#include "get_bits.h"
 
 static int parse(AVCodecParserContext *ctx,
                  AVCodecContext *avctx,
diff --git a/libavcodec/xma_parser.c b/libavcodec/xma_parser.c
index dc8a197c67..26db266a3e 100644
--- a/libavcodec/xma_parser.c
+++ b/libavcodec/xma_parser.c
@@ -21,7 +21,7 @@
  * XMA2 audio parser
  */
 
-#include "parser.h"
+#include "avcodec.h"
 
 typedef struct XMAParserContext{
     int skip_packets;