diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c
index 3af0e808fd..dfbc309583 100644
--- a/libavcodec/aac/aacdec.c
+++ b/libavcodec/aac/aacdec.c
@@ -34,7 +34,7 @@
 
 #include "libavcodec/aac.h"
 #include "libavcodec/aacsbr.h"
-#include "libavcodec/aacdec.h"
+#include "aacdec.h"
 #include "libavcodec/avcodec.h"
 #include "libavutil/attributes.h"
 #include "libavutil/error.h"
diff --git a/libavcodec/aacdec.h b/libavcodec/aac/aacdec.h
similarity index 98%
rename from libavcodec/aacdec.h
rename to libavcodec/aac/aacdec.h
index 3d15cef453..c8107f6bce 100644
--- a/libavcodec/aacdec.h
+++ b/libavcodec/aac/aacdec.h
@@ -27,8 +27,8 @@
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#ifndef AVCODEC_AACDEC_H
-#define AVCODEC_AACDEC_H
+#ifndef AVCODEC_AAC_AACDEC_H
+#define AVCODEC_AAC_AACDEC_H
 
 #include <stdint.h>
 
@@ -38,8 +38,8 @@
 #include "libavutil/mem_internal.h"
 #include "libavutil/tx.h"
 
-#include "aac.h"
-#include "mpeg4audio.h"
+#include "libavcodec/aac.h"
+#include "libavcodec/mpeg4audio.h"
 
 typedef struct AACDecContext AACDecContext;
 
@@ -349,4 +349,4 @@ void ff_aacdec_init_mips(AACDecContext *c);
 int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce,
                       GetBitContext *gb, int common_window, int scale_flag);
 
-#endif /* AVCODEC_AACDEC_H */
+#endif /* AVCODEC_AAC_AACDEC_H */
diff --git a/libavcodec/aac/aacdec_dsp_template.c b/libavcodec/aac/aacdec_dsp_template.c
index f260d32e4a..a42b40f674 100644
--- a/libavcodec/aac/aacdec_dsp_template.c
+++ b/libavcodec/aac/aacdec_dsp_template.c
@@ -29,7 +29,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/aacdec.h"
+#include "aacdec.h"
 #include "libavcodec/lpc_functions.h"
 
 #include "libavcodec/aactab.h"
diff --git a/libavcodec/aac/aacdec_fixed.c b/libavcodec/aac/aacdec_fixed.c
index d706cfcc92..a65ba19137 100644
--- a/libavcodec/aac/aacdec_fixed.c
+++ b/libavcodec/aac/aacdec_fixed.c
@@ -36,7 +36,7 @@
 #include "libavcodec/aac_defines.h"
 
 #include "libavcodec/avcodec.h"
-#include "libavcodec/aacdec.h"
+#include "aacdec.h"
 #include "libavcodec/aactab.h"
 #include "libavcodec/sinewin_fixed_tablegen.h"
 #include "libavcodec/kbdwin.h"
diff --git a/libavcodec/aac/aacdec_fixed_coupling.h b/libavcodec/aac/aacdec_fixed_coupling.h
index b6a54b35bd..add4cd69da 100644
--- a/libavcodec/aac/aacdec_fixed_coupling.h
+++ b/libavcodec/aac/aacdec_fixed_coupling.h
@@ -32,7 +32,7 @@
 #ifndef AVCODEC_AAC_AACDEC_FIXED_COUPLING_H
 #define AVCODEC_AAC_AACDEC_FIXED_COUPLING_H
 
-#include "libavcodec/aacdec.h"
+#include "aacdec.h"
 
 /**
  * Apply dependent channel coupling (applied before IMDCT).
diff --git a/libavcodec/aac/aacdec_float.c b/libavcodec/aac/aacdec_float.c
index 6801085098..f0e69579f5 100644
--- a/libavcodec/aac/aacdec_float.c
+++ b/libavcodec/aac/aacdec_float.c
@@ -36,7 +36,7 @@
 #include "libavcodec/aac_defines.h"
 
 #include "libavcodec/avcodec.h"
-#include "libavcodec/aacdec.h"
+#include "aacdec.h"
 #include "libavcodec/aactab.h"
 #include "libavcodec/sinewin.h"
 #include "libavcodec/kbdwin.h"
diff --git a/libavcodec/aac/aacdec_float_coupling.h b/libavcodec/aac/aacdec_float_coupling.h
index 475d987a66..50ad76eda2 100644
--- a/libavcodec/aac/aacdec_float_coupling.h
+++ b/libavcodec/aac/aacdec_float_coupling.h
@@ -32,7 +32,7 @@
 #ifndef AVCODEC_AAC_AACDEC_FLOAT_COUPLING_H
 #define AVCODEC_AAC_AACDEC_FLOAT_COUPLING_H
 
-#include "libavcodec/aacdec.h"
+#include "aacdec.h"
 
 /**
  * Apply dependent channel coupling (applied before IMDCT).
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 6542f8e527..666e0c89db 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -42,7 +42,7 @@
 #include "sinewin.h"
 
 #include "aac.h"
-#include "aacdec.h"
+#include "aac/aacdec.h"
 #include "aactab.h"
 #include "aac/aacdec_tab.h"
 #include "adts_header.h"
diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h
index 41ac53acea..cd030aa801 100644
--- a/libavcodec/aacsbr.h
+++ b/libavcodec/aacsbr.h
@@ -30,7 +30,7 @@
 #define AVCODEC_AACSBR_H
 
 #include "get_bits.h"
-#include "aacdec.h"
+#include "aac/aacdec.h"
 #include "aac_defines.h"
 
 #include "libavutil/attributes_internal.h"
diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c
index f1c3b0f4e0..335562b851 100644
--- a/libavcodec/aacsbr_template.c
+++ b/libavcodec/aacsbr_template.c
@@ -32,7 +32,7 @@
  * @author Zoran Basaric ( zoran.basaric@imgtec.com )
  */
 
-#include "aacdec.h"
+#include "aac/aacdec.h"
 #include "aac/aacdec_tab.h"
 #include "avcodec.h"
 #include "libavutil/qsort.h"