diff --git a/dec_video.c b/dec_video.c
index 2ca90866a3..ddbea1d07e 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -1,9 +1,13 @@
 
+#include "config.h"
+
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
diff --git a/dll_init.c b/dll_init.c
index 10041700fa..f43f79e1c5 100644
--- a/dll_init.c
+++ b/dll_init.c
@@ -1,9 +1,13 @@
 
+#include "config.h"
+
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index c7a8de8870..c45a195f6b 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -1,10 +1,14 @@
 // read video frame
 
+#include "config.h"
+
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
 
diff --git a/libmpeg2/decode.c b/libmpeg2/decode.c
index 2e75244b38..d8560380ea 100644
--- a/libmpeg2/decode.c
+++ b/libmpeg2/decode.c
@@ -5,7 +5,12 @@
 #define PACKAGE "mpeg2dec"
 #define VERSION "0.2.0-release"
 
+#include "config.h"
+
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -15,7 +20,6 @@
 #include <setjmp.h>
 
 
-#include "config.h"
 
 #include "video_out.h"
 #include <inttypes.h>
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index 60904daef7..f129103b09 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -15,20 +15,20 @@
     note: triple buffering requires VBE 3.0 - need volunteers.
   - refresh rate support (need additional info from mplayer)
 */
+#include "config.h"
+
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
 #include <limits.h>
 
-#include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #include "fastmemcpy.h"
 #include "sub.h"
 #include "linux/vbelib.h"
diff --git a/postproc/postprocess.c b/postproc/postprocess.c
index 902a6298e5..7ea6b35b95 100644
--- a/postproc/postprocess.c
+++ b/postproc/postprocess.c
@@ -70,11 +70,11 @@ Notes:
 
 //Changelog: use the CVS log
 
+#include "../config.h"
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../config.h"
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c
index 902a6298e5..7ea6b35b95 100644
--- a/postproc/postprocess_template.c
+++ b/postproc/postprocess_template.c
@@ -70,11 +70,11 @@ Notes:
 
 //Changelog: use the CVS log
 
+#include "../config.h"
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../config.h"
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif