diff --git a/ffmpeg.c b/ffmpeg.c
index d3f21d43ceb03e992017bbf700b760a120d4b3b2..c8f6107ae9cd2551ba1d55796aa8064564b5e962 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -55,7 +55,6 @@
 #undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 
-#include "version.h"
 #include "cmdutils.h"
 
 #undef NDEBUG
diff --git a/ffplay.c b/ffplay.c
index 204d64eb905d0cbece4f23c03004b83aec12c465..e6c2e7fe5c99b693cb624e1c509e65f41bbe5c4f 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -27,7 +27,6 @@
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
 
-#include "version.h"
 #include "cmdutils.h"
 
 #include <SDL.h>
diff --git a/ffserver.c b/ffserver.c
index e12e98e3fee4f1ace5260812b29416109ef7202d..9a232ed0f49bb64b3338015ff53fd155757d3a1e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -50,7 +50,6 @@
 #include <dlfcn.h>
 #endif
 
-#include "version.h"
 #include "ffserver.h"
 #include "cmdutils.h"
 
diff --git a/libavformat/siff.c b/libavformat/siff.c
index 00b4eaa9dd484e51be4ed89b3d2b06094de1d6f3..c8f892b8d53dcca2161e66f0971a31908035cd24 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -20,7 +20,6 @@
  */
 
 #include "avformat.h"
-#include "riff.h"
 
 enum SIFFTags{
     TAG_SIFF = MKTAG('S', 'I', 'F', 'F'),
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 8066c26f01096de6c0594b196437b13238fef406..460ed0c93b17d1d7bee6eec8efdc6018fbfd57d7 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -25,7 +25,6 @@
 
 #include "libavutil/bswap.h"
 #include "avformat.h"
-#include "riff.h"
 
 #define SMACKER_PAL 0x01
 #define SMACKER_FLAG_RING_FRAME 0x01
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 0896c0aca850d7485a93e725edf80151c1845d45..f2eedc7fe7097d3edb8dbac6503ac65058d1125a 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -26,7 +26,6 @@
 #include "libavutil/bswap.h"
 #include "avformat.h"
 #include "raw.h"
-#include "riff.h"
 
 /* if we don't know the size in advance */
 #define AU_UNKNOWN_SIZE ((uint32_t)(~0))
diff --git a/vhook/watermark.c b/vhook/watermark.c
index 74f50953139094f3cda6a9b446820e5992544467..1d4be28f6c24ff4679eb2979dda4d6096087d878 100644
--- a/vhook/watermark.c
+++ b/vhook/watermark.c
@@ -62,7 +62,6 @@
 #include "libavformat/avformat.h"
 #include "libavformat/framehook.h"
 #include "libswscale/swscale.h"
-#include "cmdutils.h"
 
 static int sws_flags = SWS_BICUBIC;