diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index b9b1edcd9e..2df4c11f82 100644
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/attributes.h"
+#include "libavutil/avassert.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h
index ed846aac52..955e31a698 100644
--- a/libavutil/mem_internal.h
+++ b/libavutil/mem_internal.h
@@ -25,7 +25,8 @@
 
 #include <stdint.h>
 
-#include "avassert.h"
+#include "attributes.h"
+#include "macros.h"
 #include "mem.h"
 #include "version.h"
 
diff --git a/libavutil/tx.c b/libavutil/tx.c
index e6fcf9f451..c90ca509f5 100644
--- a/libavutil/tx.c
+++ b/libavutil/tx.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "avassert.h"
 #include "cpu.h"
 #include "qsort.h"
 #include "bprint.h"