diff --git a/libavcodec/x86/hevcdsp.h b/libavcodec/x86/hevc/dsp.h
similarity index 98%
rename from libavcodec/x86/hevcdsp.h
rename to libavcodec/x86/hevc/dsp.h
index f8352750e4..03986b970a 100644
--- a/libavcodec/x86/hevcdsp.h
+++ b/libavcodec/x86/hevc/dsp.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_X86_HEVCDSP_H
-#define AVCODEC_X86_HEVCDSP_H
+#ifndef AVCODEC_X86_HEVC_DSP_H
+#define AVCODEC_X86_HEVC_DSP_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -186,4 +186,4 @@ void ff_hevc_add_residual_32_10_sse2(uint8_t *dst, const int16_t *res, ptrdiff_t
 void ff_hevc_add_residual_16_10_avx2(uint8_t *dst, const int16_t *res, ptrdiff_t stride);
 void ff_hevc_add_residual_32_10_avx2(uint8_t *dst, const int16_t *res, ptrdiff_t stride);
 
-#endif // AVCODEC_X86_HEVCDSP_H
+#endif // AVCODEC_X86_HEVC_DSP_H
diff --git a/libavcodec/x86/hevc/dsp_init.c b/libavcodec/x86/hevc/dsp_init.c
index 16ea62dd00..ba921e7299 100644
--- a/libavcodec/x86/hevc/dsp_init.c
+++ b/libavcodec/x86/hevc/dsp_init.c
@@ -27,7 +27,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/hevc/dsp.h"
-#include "libavcodec/x86/hevcdsp.h"
+#include "libavcodec/x86/hevc/dsp.h"
 #include "libavcodec/x86/h26x/h2656dsp.h"
 
 #define LFC_FUNC(DIR, DEPTH, OPT) \