diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 6399548..9abce9b 100644
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -25,16 +25,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 4f903e8..b57876a 100644
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <math.h>                                        /* sqrt */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                        /* sqrt */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index a663324..5948f05 100644
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -24,6 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <math.h>                                        /* sqrt */
 
 #ifdef HAVE_STDINT_H
@@ -36,10 +40,6 @@
 #   include <unistd.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_es.h>
diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index 9c9b08d..999796a 100644
--- a/modules/audio_filter/equalizer.c
+++ b/modules/audio_filter/equalizer.c
@@ -24,12 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <math.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c
index 97ed3c7..0c57c0b 100644
--- a/modules/audio_filter/normvol.c
+++ b/modules/audio_filter/normvol.c
@@ -32,6 +32,10 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <ctype.h>
 #include <signal.h>
@@ -39,10 +43,6 @@
 #include <math.h>
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c
index acd04de..53c000f 100644
--- a/modules/audio_filter/param_eq.c
+++ b/modules/audio_filter/param_eq.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <math.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index c8af6f5..07da0fe 100644
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index db1e28e..fcd3ca0 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -26,15 +26,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
-#include <fcntl.h>                                       /* open(), O_WRONLY */
-#include <sys/ioctl.h>                                            /* ioctl() */
-#include <unistd.h>                                      /* write(), close() */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>                                                 /* ENOMEM */
+#include <fcntl.h>                                       /* open(), O_WRONLY */
+#include <sys/ioctl.h>                                            /* ioctl() */
+#include <unistd.h>                                      /* write(), close() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
diff --git a/modules/control/motion.c b/modules/control/motion.c
index ccecf4d..59d6ba2 100644
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <math.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index 93d695d..5f2a5f0 100644
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -24,12 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index ecc6fa1..520c6bb 100644
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -22,13 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-
-#ifdef WIN32
-#   include <io.h>
-#else
-#   include <stdio.h>
-#endif
-
 #ifdef __LIBVLC__
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -42,6 +35,12 @@
 #   include "drmsvl.h"
 #endif
 
+#ifdef WIN32
+#   include <io.h>
+#else
+#   include <stdio.h>
+#endif
+
 #ifdef HAVE_ERRNO_H
 #   include <errno.h>
 #endif
diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c
index 9f77b6a..c4b6ca5 100644
--- a/modules/mux/mpeg/pes.c
+++ b/modules/mux/mpeg/pes.c
@@ -25,15 +25,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
+
 #include <vlc_common.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 147d4d0..12f0309 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>                                                 /* ENOMEM */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index e84d248..6c608bb 100644
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <math.h>                                            /* exp(), pow() */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* exp(), pow() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
diff --git a/modules/video_chroma/i420_ymga.c b/modules/video_chroma/i420_ymga.c
index 63d09a8..4efc6a6 100644
--- a/modules/video_chroma/i420_ymga.c
+++ b/modules/video_chroma/i420_ymga.c
@@ -24,12 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>                                                 /* ENOMEM */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index 9d5ff52..a3588e8 100644
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -25,13 +25,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
-#include <math.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>
+#include <math.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 73b81d3..31f90f0 100644
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -24,13 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
-#include <math.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>
+#include <math.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 380d0f0..256462d 100644
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -24,12 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>
+
 #ifdef HAVE_ALTIVEC_H
 #   include <altivec.h>
 #endif
diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index e060b3f..ade94b9 100644
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -26,12 +26,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <math.h>                                            /* sin(), cos() */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* sin(), cos() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index 8be202a..271533d 100644
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -26,12 +26,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <math.h>                                            /* sin(), cos() */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* sin(), cos() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index 5dcbcb0..0010856 100644
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -26,12 +26,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <math.h>                                            /* sin(), cos() */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* sin(), cos() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index 38f3c06..e185a33 100644
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -25,12 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <math.h>                                            /* sin(), cos() */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* sin(), cos() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index 3a9c0a5..36f740c 100644
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -26,12 +26,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <math.h>                                            /* sin(), cos() */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* sin(), cos() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 03d94b3..e3a8fb9 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -25,6 +25,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <signal.h>                                      /* SIGUSR1, SIGUSR2 */
 #include <fcntl.h>                                                 /* open() */
@@ -38,10 +43,6 @@
 #include <linux/vt.h>                                                /* VT_* */
 #include <linux/kd.h>                                                 /* KD* */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index deab0f7..d9eaac1 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -27,12 +27,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>                                                 /* ENOMEM */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 9339e6f..fe5d122 100644
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>                                                 /* ENOMEM */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index 7c20453..e59e0b6 100644
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc_filter.h>
 #include <vlc_arrays.h>
 
diff --git a/src/misc/image.c b/src/misc/image.c
index aa8a301..5a1a80f 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -29,12 +29,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>
-#include <errno.h>
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <ctype.h>
+#include <errno.h>
+
 #include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_filter.h>
diff --git a/src/misc/md5.c b/src/misc/md5.c
index cb57f7b..f4f93ff 100644
--- a/src/misc/md5.c
+++ b/src/misc/md5.c
@@ -22,11 +22,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <string.h>
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include <vlc_common.h>
 #include <vlc_md5.h>
 
diff --git a/src/text/iso_lang.c b/src/text/iso_lang.c
index 5e7a6c6..eaae385 100644
--- a/src/text/iso_lang.c
+++ b/src/text/iso_lang.c
@@ -25,12 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdio.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <stdio.h>
+
 #include <vlc_common.h>
 
 #include "vlc_iso_lang.h"