diff --git a/libavutil/crc.c b/libavutil/crc.c
index bc21f5bee8..cc968024d3 100644
--- a/libavutil/crc.c
+++ b/libavutil/crc.c
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
+#include "config.h"
+#include "bswap.h"
 #include "crc.h"
 
 #ifdef CONFIG_HARDCODED_TABLES
diff --git a/libavutil/md5.c b/libavutil/md5.c
index d7c4f300c3..87b4026dc1 100644
--- a/libavutil/md5.c
+++ b/libavutil/md5.c
@@ -30,8 +30,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
 #include <string.h>
+#include "bswap.h"
 #include "md5.h"
 
 typedef struct AVMD5{