diff --git a/cmdutils.c b/cmdutils.c
index cbf660f244347335f5994fdc7c37064f99ff8061..c7e8acf391d3a3ff43a6ed99273cd4bcd5086f11 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -20,6 +20,7 @@
  */
 
 #include <string.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <math.h>
diff --git a/ffmpeg.c b/ffmpeg.c
index 26cbbe3894e658969b558cb76ce881a7803f1f8e..554cde6c87c76f7a712ba019bfdcc92537fd78d0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdint.h>
+
 #if HAVE_ISATTY
 #if HAVE_IO_H
 #include <io.h>
@@ -38,6 +40,7 @@
 #include <unistd.h>
 #endif
 #endif
+
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswresample/swresample.h"
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index ad97f0dd81e7bc08224701b9ce279750dd72176d..9d945fca49c6c29bd19783461469c5af96873f88 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "ffmpeg.h"
 
 #include "libavfilter/avfilter.h"
diff --git a/ffplay.c b/ffplay.c
index 137837c76a300b1e59ef8219ef03aa0968fffffa..c67138300b36c5c9a02b985f76a985c68966c3b9 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -28,6 +28,8 @@
 #include <math.h>
 #include <limits.h>
 #include <signal.h>
+#include <stdint.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/mathematics.h"
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 0e1551c23fb7338faf1464087db104c3844e3341..1fb91853d01c02dfb76451bc75544cf0def16780 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -105,6 +105,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <math.h>
+#include <stdint.h>
 #include <string.h>
 
 #if ARCH_ARM
diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index 2b64b3ece9087a488c68967fdc67eb009f915f71..8dd356dde415319c57f7a249be18f8eaee607393 100644
--- a/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@ -24,6 +24,8 @@
  * huffman tree builder and VLC generator
  */
 
+#include <stdint.h>
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "huffman.h"
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 5d69539171a096b088de89f698513af6d8a44116..e71f5b00b9643272c627c24b63250ef750f87506 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -25,6 +25,8 @@
  * IFF ACBM/DEEP/ILBM/PBM bitmap decoder
  */
 
+#include <stdint.h>
+
 #include "libavutil/imgutils.h"
 #include "bytestream.h"
 #include "avcodec.h"
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 68827895b72d5d662776e8cede249d7832999238..a550379534db66cd7812a0c22a97164b09fe2d73 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -25,6 +25,8 @@
  * MPEG1/2 encoder
  */
 
+#include <stdint.h>
+
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/log.h"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 1961794fad75ae9cef7ad0c09d4b4465ca74a9f8..caadf17b399905654bef1f5ee1099366972c7cec 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -27,6 +27,8 @@
  * The simplest mpeg encoder (well, it was the simplest!).
  */
 
+#include <stdint.h>
+
 #include "libavutil/internal.h"
 #include "libavutil/intmath.h"
 #include "libavutil/mathematics.h"
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 427a4a2205a53de8f4d3dc2aa3ded88d18aabd7b..49af29cbccf079d6a1092202e7f49e053198899f 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -24,6 +24,7 @@
 
 #include <float.h>
 #include <limits.h>
+#include <stdint.h>
 
 #include "libavutil/opt.h"
 #include "avcodec.h"
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 8a825938a6518deceadbeecd0b3cb41e24e173d5..083ce022b5df205e45186d620f983f399294fb09 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
 #include <string.h>
 
 #include "parser.h"
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index dc8805c12723af70bece35fd6e400b7489b7d9ed..5f8e1f61cc7c70174b08824d34eafc841c5f8d47 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavresample/avresample.h"
 #include "libavutil/attributes.h"
 #include "libavutil/audio_fifo.h"
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 5bec10fcce5720181f9297b8f2b678c3d625df13..d1289e2fe856b631e08d83ccf4ca062d54a09120 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -28,6 +28,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
diff --git a/libavfilter/trim.c b/libavfilter/trim.c
index fdc62456499837be992300f3aadec5a8ca864465..04e82dab104486df5b61e71fff30ac92e8bd37b7 100644
--- a/libavfilter/trim.c
+++ b/libavfilter/trim.c
@@ -18,6 +18,7 @@
 
 #include <float.h>
 #include <math.h>
+#include <stdint.h>
 
 #include "config.h"
 
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 1d1b947f3dbf4fcc9d241eadf3bfadaad75461ae..e6266ccb50209fa55dda42b9cb0d3347d81f342c 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -26,6 +26,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/common.h"
 #include "libavutil/fifo.h"
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index 7c0b4fb80332033bf3a5ad8b6b49bfb335ff1ab9..6e3d8bc6add96ffe3976e325f3bb62cda3e2edd9 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/intfloat.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 35fcb519c1171d2ac1f9a601174c369055b909f9..c9bd63b3c4dc71c1557d5d7fb6a7beb56d08b47c 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "avformat.h"
 #include "internal.h"
 #include "subtitles.h"
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index be9715c4f76c3febc87ce43495fdc8616d426d09..1c6b18c9805e773300d4b703470e24091d85246e 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bswap.h"
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index b20ee131b6be10ec3e3831aca673330661de7bc4..679d926da16c0a0e123ae938ccf9222c16c974a0 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat.h"
 #include "avformat.h"
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index dcd53e5f4068b642b0832686ae71262b3e4dd1c6..b9bf60543fad72eafafe93b8b6027b3a0ad7cb62 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -20,6 +20,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index eaeccdeb873e9955f2d06a5ea56be2936b7ec766..e461c5e60eddfdd3034114ab5c2a4c1ef093b08a 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "avc.h"
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/mov.c b/libavformat/mov.c
index bb141c8a2a13a56b2471f46516b4ed6bcd5664d0..94bd32fd28df84decc9c92cad70771dc7e34888f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -24,6 +24,7 @@
  */
 
 #include <limits.h>
+#include <stdint.h>
 
 //#define MOV_EXPORT_ALL_METADATA
 
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index cfb73d7b396be51dc6d00c763fa5a1bdcbe79455..92ce5341e643b634d6173141e00ffbeca04e9845 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "movenc.h"
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 0a9d69b3446cca5ca1810f954c053b8dc33b889a..2c7fff22d450d645507ae604ba9282f935520b74 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/attributes.h"
 #include "libavutil/fifo.h"
 #include "libavutil/log.h"
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 1787abce120bfa16d1f691dc3f50e327b2d5915f..61c0cb2366b87ce3b22d8c77a8ccd8bf950e6781 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -43,6 +43,8 @@
  * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1
  */
 
+#include <stdint.h>
+
 #include "libavutil/aes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/mathematics.h"
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index b6d754d595f004b2cefba23744535c44cdf85f76..10b8fc88eb72f7a376af1f8a9648f5333ccb6f88 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/tree.h"
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 18835017451b5b14caf35e8c5a18a74f3e132e6a..e846d3b0f5d8dc64f078e558453f521cd69fe54c 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/crc.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index ff4006497f21fef1f676bf46c15073f5aeeb2e42..56f4cf29ff6c6484aa8fa89ddb99a7e68845cd31 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -32,6 +32,8 @@
  * optional background_frame
  */
 
+#include <stdint.h>
+
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "avformat.h"
diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index 61a2316412ad3351414978576d478a3fd00d1df6..85b573ea1f07a60017086cad8ac78fbc8f1f061f 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -19,11 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "internal.h"
-#include <stdlib.h>
 
 #define RPL_SIGNATURE "ARMovie\x0A"
 #define RPL_SIGNATURE_SIZE 8
diff --git a/libavformat/seek.c b/libavformat/seek.c
index 07c3f79522f8d38078ec6e8358d46eb3064d5b34..bb5ca87cfa17d0041b3dbd75fbd6e5a52c73392f 100644
--- a/libavformat/seek.c
+++ b/libavformat/seek.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "seek.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
diff --git a/libavformat/utils.c b/libavformat/utils.c
index ddaeb3bf8712527d01518b981c0372597efddf0a..06758bf8b7b54f10f030a2eb5f390602fedf66ec 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 202683bb5d381af401d0cca524a1a2313026c5b7..daea64edc5a0841168a998b1743af5e9611fbed0 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/avassert.h"
 #include "libavutil/dict.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 135faf2f7ae93d321ea233a9985a1653ace8a289..e629b3f38441b75225a129c2e9379dffe6002f31 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -20,6 +20,7 @@
  */
 
 #include <inttypes.h>
+#include <stdint.h>
 
 #include "avformat.h"
 #include "internal.h"
diff --git a/libavresample/options.c b/libavresample/options.c
index a0dda6f88638a89ff94e365f9548b7d68df0b488..5f08cd7e52292ae5b025b3891febd47c38f5dac3 100644
--- a/libavresample/options.c
+++ b/libavresample/options.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 2b85de31d918a5617edc5eb0c6143ac9906fdfb7..4c0677f794f35710e7d104401fb0044847287992 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -23,6 +23,8 @@
  * audio channel layout utility functions
  */
 
+#include <stdint.h>
+
 #include "avstring.h"
 #include "avutil.h"
 #include "channel_layout.h"
diff --git a/libavutil/common.h b/libavutil/common.h
index e487218e729b3271f6b1e4e64b3f1efd3785751f..c82a3a624081355f64d811f452994de49c814b11 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -34,6 +34,7 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <math.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 1dc5abb2b8635cbe1bf4c73a8a4080a18dadfde1..e0806b18560866857ef1c3755bb44417a1053f81 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "cpu.h"
 #include "cpu_internal.h"
 #include "config.h"