diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index 933369e445..1fbd259e51 100644
--- a/libavcodec/aacpsy.c
+++ b/libavcodec/aacpsy.c
@@ -28,7 +28,7 @@
 #include "libavutil/ffmath.h"
 
 #include "avcodec.h"
-#include "aactab.h"
+#include "aac.h"
 #include "psymodel.h"
 
 /***********************************
diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index edb51d8810..d20ac56a3f 100644
--- a/libavcodec/aactab.c
+++ b/libavcodec/aactab.c
@@ -27,15 +27,15 @@
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#include "config.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "config_components.h"
+#include "libavutil/attributes.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
-#include "aac.h"
 #include "aactab.h"
 
-#include <stdint.h>
-
 #if CONFIG_AAC_ENCODER || CONFIG_AAC_DECODER
 #include "kbdwin.h"
 #include "sinewin.h"
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index 7693876c34..81db29a4e4 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -31,7 +31,7 @@
 #define AVCODEC_AACTAB_H
 
 #include "libavutil/mem_internal.h"
-#include "aac.h"
+#include "aac_defines.h"
 
 #include <stdint.h>