diff --git a/libavutil/common.h b/libavutil/common.h
index de2140a678..57c87f1919 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -42,6 +42,13 @@
 #include "attributes.h"
 #include "error.h"
 #include "macros.h"
+#include "mem.h"
+
+#ifdef HAVE_AV_CONFIG_H
+#   include "config.h"
+#   include "intmath.h"
+#   include "internal.h"
+#endif /* HAVE_AV_CONFIG_H */
 
 //rounded division & shift
 #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
@@ -84,11 +91,6 @@
 
 /* misc math functions */
 
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
 #ifndef av_ceil_log2
 #   define av_ceil_log2     av_ceil_log2_c
 #endif
@@ -568,12 +570,4 @@ static av_always_inline av_const int av_parity_c(uint32_t v)
         }\
     }\
 
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
 #endif /* AVUTIL_COMMON_H */