diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c
index efa674767864484cf1cff720318b93d514a9cd8f..3e8e70b548cdbc522469ee18425eeebdbed884db 100644
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa-audio-dec.c
@@ -46,11 +46,14 @@
  */
 
 #include <alsa/asoundlib.h>
-#include "libavformat/internal.h"
-#include "libavutil/opt.h"
+
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libavutil/time.h"
 
+#include "libavformat/internal.h"
+
 #include "avdevice.h"
 #include "alsa-audio.h"
 
diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c
index 43d097de5345bdc88822fca9a328e4982752edbc..acf8af3008661c3ff6f49fca99d19e9ed9890ad0 100644
--- a/libavdevice/alsa-audio-enc.c
+++ b/libavdevice/alsa-audio-enc.c
@@ -39,7 +39,10 @@
 
 #include <alsa/asoundlib.h>
 
+#include "libavutil/internal.h"
 #include "libavutil/time.h"
+
+
 #include "libavformat/internal.h"
 #include "avdevice.h"
 #include "alsa-audio.h"
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c
index 0c52a8eebd2b2a3ab08613ab55376fd94f3bdb65..053dba70a0b9412fc70a877c9ef99c31626ab481 100644
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@@ -24,6 +24,7 @@
 #include <semaphore.h>
 #include <jack/jack.h>
 
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/fifo.h"
 #include "libavutil/opt.h"
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 77024b312fbc0f77e71369c2bc009189cf8e82b0..5f49c5ed02a1fb4202991f534e30078942c9f686 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -21,13 +21,6 @@
  */
 
 #include "config.h"
-#include "libavformat/avformat.h"
-#include "libavformat/internal.h"
-#include "libavutil/log.h"
-#include "libavutil/mathematics.h"
-#include "libavutil/opt.h"
-#include "libavutil/parseutils.h"
-#include "libavutil/pixdesc.h"
 
 #if HAVE_LIBDC1394_2
 #include <dc1394/dc1394.h>
@@ -48,6 +41,16 @@
 #define DC1394_FRAMERATE_240   FRAMERATE_240
 #endif
 
+#include "libavutil/internal.h"
+#include "libavutil/log.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
+
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+
 typedef struct dc1394_data {
     AVClass *class;
 #if HAVE_LIBDC1394_1
diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c
index 3cd0087d5ddad5e1ad721587168c49a3b1d13158..aa0800b40bf5f4846329081ba0c2c1566353cf34 100644
--- a/libavdevice/pulse_audio_dec.c
+++ b/libavdevice/pulse_audio_dec.c
@@ -23,10 +23,13 @@
 
 #include <pulse/rtclock.h>
 #include <pulse/error.h>
-#include "libavformat/avformat.h"
-#include "libavformat/internal.h"
+
+#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/time.h"
+
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
 #include "pulse_audio_common.h"
 #include "timefilter.h"
 
diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
index 37c6983429ed76d9c9af1f274f933607c1944c16..9cc99526767030b19d4cfbba3e9f579a3da42c7d 100644
--- a/libavdevice/sndio_dec.c
+++ b/libavdevice/sndio_dec.c
@@ -22,11 +22,13 @@
 #include <stdint.h>
 #include <sndio.h>
 
-#include "libavformat/avformat.h"
-#include "libavformat/internal.h"
+#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/time.h"
 
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+
 #include "sndio_common.h"
 
 static av_cold int audio_read_header(AVFormatContext *s1)
diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c
index 205cf2411d8041544d4eead741a899a1d66bb7ab..2a24620e4ba573f64febd27e45a278c8420e5e2d 100644
--- a/libavdevice/sndio_enc.c
+++ b/libavdevice/sndio_enc.c
@@ -22,6 +22,9 @@
 #include <stdint.h>
 #include <sndio.h>
 
+#include "libavutil/internal.h"
+
+
 #include "avdevice.h"
 #include "sndio_common.h"
 
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 00fb48b516eb7ca4219f0c1584ad4368a3fc1a04..7929ac835ee5bfa36c20c4fc7f5e263c20bb7d4f 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -19,12 +19,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavformat/internal.h"
+#include <vfw.h>
+#include <windows.h>
+
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
-#include <windows.h>
-#include <vfw.h>
+
+#include "libavformat/internal.h"
+
 #include "avdevice.h"
 
 /* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index be883da00536edb08949ed5094be001b171d02fd..d3b0b02e917a73e1e5f214f5f18679ff2d522b3e 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -52,8 +52,7 @@
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XShm.h>
 
-#include "avdevice.h"
-
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
@@ -61,6 +60,8 @@
 
 #include "libavformat/internal.h"
 
+#include "avdevice.h"
+
 /** X11 device demuxer context */
 typedef struct X11GrabContext {
     const AVClass *class;    /**< Class for private options. */
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
index 17d8f9aceea7caca2c6096616006b8cb86536ef5..777bd255fb2ab55c904efbca3329694988cdf7b1 100644
--- a/libavdevice/xcbgrab.c
+++ b/libavdevice/xcbgrab.c
@@ -37,14 +37,15 @@
 #include <xcb/shape.h>
 #endif
 
-#include "libavformat/avformat.h"
-#include "libavformat/internal.h"
-
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/time.h"
 
+#include "libavformat/avformat.h"
+#include "libavformat/internal.h"
+
 typedef struct XCBGrabContext {
     const AVClass *class;