diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 66d7a8bab3c4863a0a84fbbc80b8b4be21bb47c3..4ba0d6b2dd0524170020c60a12ac7473efafbb98 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -40,7 +40,8 @@
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
-#include "libavcodec/version.h"
+#include "version.h"
+
 /**
  * @defgroup libavc Encoding/Decoding Library
  * @{
diff --git a/libavcodec/s3tc.c b/libavcodec/s3tc.c
index 4e791c86c0eb6cbdfa1a4f669e7b79f65b9b1e86..4743d784fcd5a821a4c43b088d2054b9969843df 100644
--- a/libavcodec/s3tc.c
+++ b/libavcodec/s3tc.c
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bytestream.h"
 #include "avcodec.h"
+#include "bytestream.h"
 #include "s3tc.h"
 
 static inline void dxt1_decode_pixels(GetByteContext *gb, uint32_t *d,
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c
index 5ad74c10fd573dd3ad83b47000d565566b6f41d2..38214275706e3919c0dd66c88b0b7640063b51c6 100644
--- a/libavutil/blowfish.c
+++ b/libavutil/blowfish.c
@@ -21,10 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-
 #include "avutil.h"
 #include "common.h"
+#include "intreadwrite.h"
 #include "blowfish.h"
 
 static const uint32_t orig_p[AV_BF_ROUNDS + 2] = {
diff --git a/libavutil/des.c b/libavutil/des.c
index a7a5074203a83ca0f18da9abe0f4541bb7e07882..57ad0a4fffc8d7f87cf084b9222fee1d7b4412e2 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -339,7 +339,9 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) {
 #ifdef TEST
 #include <stdlib.h>
 #include <stdio.h>
-#include "libavutil/time.h"
+
+#include "time.h"
+
 static uint64_t rand64(void) {
     uint64_t r = rand();
     r = (r << 32) | rand();
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c
index 64bd2e6437433de4cebcd2ac51ea023fa852bac2..efff47f89aa70d95fd8939bc4a47634b19c9818b 100644
--- a/libavutil/float_dsp.c
+++ b/libavutil/float_dsp.c
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "libavutil/attributes.h"
+#include "attributes.h"
 #include "float_dsp.h"
 
 static void vector_fmul_c(float *dst, const float *src0, const float *src1,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 8489a39770dbce6160d540a6ed0029348c1d48af..4fc9c7fb7b236f7081ec45949cc58e0e6b6508f7 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -28,7 +28,7 @@
  */
 
 #include "libavutil/avconfig.h"
-#include "libavutil/version.h"
+#include "version.h"
 
 #define AVPALETTE_SIZE 1024
 #define AVPALETTE_COUNT 256
diff --git a/libavutil/time.c b/libavutil/time.c
index 27feb0b7582fdb011b01dab1165d6b04e1db6cac..5a00e7025d0dd6bd31fcf09fedfa8b4dc5dcbc3a 100644
--- a/libavutil/time.c
+++ b/libavutil/time.c
@@ -33,7 +33,7 @@
 #include <windows.h>
 #endif
 
-#include "libavutil/time.h"
+#include "time.h"
 #include "error.h"
 
 int64_t av_gettime(void)
diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index 5fbfd58efabaed646417259ae3cee9fe379a9fa0..5bb4cf7bf550e7e47bd45d7061fd1516e63908e3 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -21,10 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-
 #include "avutil.h"
 #include "common.h"
+#include "intreadwrite.h"
 #include "xtea.h"
 
 void av_xtea_init(AVXTEA *ctx, const uint8_t key[16])
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index c6d514f08915df091be649983cd0bb7253e47f1c..340cc702055c1f9e2051227bd87f63c5f05d7237 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -28,8 +28,8 @@
 
 #include <inttypes.h>
 
-#include "libswscale/swscale.h"
 #include "libavutil/avutil.h"
+#include "swscale.h"
 
 /* A full collection of RGB to RGB(BGR) converters */
 extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size);