diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 7563625627..01ce186dae 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -20,6 +20,7 @@
 
 #include <mfxvideo.h>
 #include <mfxjpeg.h>
+#include <mfxvp8.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -39,8 +40,6 @@
 #define QSV_HAVE_USER_PLUGIN    !QSV_ONEVPL
 #define QSV_HAVE_AUDIO          !QSV_ONEVPL
 
-#include "mfxvp8.h"
-
 #if QSV_HAVE_USER_PLUGIN
 #include <mfxplugin.h>
 #endif
diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c
index fac8d7c048..6632bae3ec 100644
--- a/libavfilter/avf_aphasemeter.c
+++ b/libavfilter/avf_aphasemeter.c
@@ -23,6 +23,8 @@
  * audio to video multimedia aphasemeter filter
  */
 
+#include <float.h>
+
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
@@ -34,7 +36,6 @@
 #include "audio.h"
 #include "video.h"
 #include "internal.h"
-#include "float.h"
 
 typedef struct AudioPhaseMeterContext {
     const AVClass *class;
diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c
index fd8641ff75..1eca7df975 100644
--- a/libavfilter/f_drawgraph.c
+++ b/libavfilter/f_drawgraph.c
@@ -20,8 +20,6 @@
 
 #include "config_components.h"
 
-#include "float.h"
-
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c
index e0b20114e0..3fefa49138 100644
--- a/libavfilter/f_graphmonitor.c
+++ b/libavfilter/f_graphmonitor.c
@@ -20,8 +20,6 @@
 
 #include "config_components.h"
 
-#include "float.h"
-
 #include "libavutil/pixdesc.h"
 #include "libavutil/eval.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c
index a312ca76c9..ba2d425198 100644
--- a/libavfilter/vf_lut3d.c
+++ b/libavfilter/vf_lut3d.c
@@ -24,9 +24,9 @@
  * 3D Lookup table filter
  */
 
-#include "config_components.h"
+#include <float.h>
 
-#include "float.h"
+#include "config_components.h"
 
 #include "libavutil/opt.h"
 #include "libavutil/file_open.h"