diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index caf828496d76cefc76f7d5fbd11dd63208e42970..2a39b433c3ee4b7a5be1e76b8b80d46db28a3f6d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -39,7 +39,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 62dc3567924c8084a4762ab02818be76b32acadd..d35cf2ac0713307ab6989606c6499c5c0dc51d44 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 63cc4043ff4df1ca3efb1c6bc0aa5ea60e5dafb5..8437dd6f9491be694a9ada8d5f7a58b002085ae0 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 01cb10b359f105ac8f704febfea53974f6f6c012..ab0fc2f8bc9746af503642fd31dd73d0a914a92b 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 3eda27a3c3045b9c370d0e0d0b2e9dcb1b66d2b0..3707e066947b8c2f7e84368b93be5c5f618cef13 100644
--- a/libavutil/float_dsp.c
+++ b/libavutil/float_dsp.c
@@ -17,7 +17,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 77305cacdc073721a1d62c9195456109d8c180a6..4b0494490df45d74a17c0aa3d2ade2333195c38d 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -28,7 +28,7 @@
  */
 
 #include "libavutil/avconfig.h"
-#include "libavutil/version.h"
+#include "version.h"
 
 /**
  * Pixel format.
diff --git a/libavutil/time.c b/libavutil/time.c
index 51779c5d177183ce0dd8ecd0b34f018ad89c84d6..62cd445dbca68f592fb71bd82366d2ee70ddc879 100644
--- a/libavutil/time.c
+++ b/libavutil/time.c
@@ -31,7 +31,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 1187662eb2a8ecaf296c18820f1fb1808e28d92c..d1efebf590332740861f9ba28a5f0e2aab9e2738 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 42f468fe2137b5c909492da8723eff2f3f11d9be..79c378da75df02ebf46a02dd049fbe34f706ef55 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);