diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index faf3e95c64..19487d731d 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -27,11 +27,11 @@
  */
 #include <inttypes.h>
 #include "config.h"
+#include "libavutil/x86_cpu.h"
+#include "libavutil/bswap.h"
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "x86_cpu.h"
-#include "bswap.h"
 
 #define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit
 
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c
index 0b6eff18bb..79e21a922a 100644
--- a/libswscale/swscale-example.c
+++ b/libswscale/swscale-example.c
@@ -25,7 +25,7 @@
 #include <stdarg.h>
 
 #undef HAVE_AV_CONFIG_H
-#include "avutil.h"
+#include "libavutil/avutil.h"
 #include "swscale.h"
 #include "swscale_internal.h"
 #include "rgb2rgb.h"
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index a74963f32c..a30ebe9477 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -69,9 +69,9 @@ untested special converters
 #endif
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "x86_cpu.h"
-#include "bswap.h"
 #include "rgb2rgb.h"
+#include "libavutil/x86_cpu.h"
+#include "libavutil/bswap.h"
 #include "libavcodec/opt.h"
 
 #undef MOVNTQ
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 5083c455b3..d8dc974ac1 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -27,7 +27,7 @@
 #include <altivec.h>
 #endif
 
-#include "avutil.h"
+#include "libavutil/avutil.h"
 
 #define MAX_FILTER_SIZE 256