diff --git a/bswap.h b/libavcodec/bswap.h
similarity index 94%
rename from bswap.h
rename to libavcodec/bswap.h
index 21ef3a74eb..af80e507f6 100644
--- a/bswap.h
+++ b/libavcodec/bswap.h
@@ -1,15 +1,10 @@
 #ifndef __BSWAP_H__
 #define __BSWAP_H__
 
-/* It's need for ffmpeg. Else where will be defined ARCH_X86?*/
-#include "config.h"
-
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #else
 
-#include <inttypes.h>
-
 #ifdef ARCH_X86
 inline static unsigned short ByteSwap16(unsigned short x)
 {
@@ -88,4 +83,4 @@ inline static unsigned long long int ByteSwap64(unsigned long long int x)
 #define le2me_64(x) (x)
 #endif
 
-#endif
+#endif /* __BSWAP_H__ */