diff --git a/avconv.c b/avconv.c
index b2d20dd38afaea9b1a46b08c863823fbe65cb08e..908a0c75dae51734e145e76e6319fd0cf4db0266 100644
--- a/avconv.c
+++ b/avconv.c
@@ -27,6 +27,8 @@
 #include <errno.h>
 #include <signal.h>
 #include <limits.h>
+#include <stdint.h>
+
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
diff --git a/avconv_filter.c b/avconv_filter.c
index ffccd93eee5c0ac5727dd762c9bd0ed6ff584696..892db00f478710fe70785d3a6eb1d64a099de8da 100644
--- a/avconv_filter.c
+++ b/avconv_filter.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+
 #include "avconv.h"
 
 #include "libavfilter/avfilter.h"
diff --git a/avplay.c b/avplay.c
index d6c71e95e43705a73fbff282a7ca1dbba8bd486c..96e0cf2d9efae6c2845bda070c03fcc5b243f9bd 100644
--- a/avplay.c
+++ b/avplay.c
@@ -23,6 +23,8 @@
 #include <inttypes.h>
 #include <math.h>
 #include <limits.h>
+#include <stdint.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/mathematics.h"
diff --git a/cmdutils.c b/cmdutils.c
index d6eb981205b0650be4d9317e9b5b2a2e0d67e516..3f1c667075724c5cde69d840ed5ed7d992898334 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/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 6a059382819ebfe3c15fa46d6d77c1932be11228..426a652a4c10da1337c8231a53b0c98cea918f3f 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -103,6 +103,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 aef4929b1ca96ef900394a7fcdc3ba0e6139b4d2..dec2197fc98d0b8ce4cae80b36e6329e336e23c7 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 7ac78b0e5cbd9472f89e90cb27655600a65d33f9..112c2ca93cfe226e838d41c4e46d469f951158d5 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -25,6 +25,8 @@
  * IFF PBM/ILBM 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 41eefe2211debfae65a7ade8430313ba3b451be4..2e03ce3ccc7d67ff6956b202639f139474de5a2d 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/log.h"
 #include "libavutil/opt.h"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 74a3468e48c2b67949afffed87ca6283ab2a6945..414be908e5b019845770e76ef12f197dda4a3961 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 3dc2780664a9ae19e700d061f686db52b3b495b0..8b3a4b64d74bfaf7ab31c63b43db8baa36f2ab48 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -22,6 +22,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 6e755f6b75c0d9f73a5eb0bb18c2bfc6bcfaf997..511f1f3ed119dc40d0bba807601ac4ae1cb2bdd6 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 b76ddf0f2186494d6ec154c6b8095d128b0f3584..e662c842aca9e4240e417bc293473190f3976c68 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/trim.c b/libavfilter/trim.c
index 36a56537f37c157a62be52d2cf18d9b2c945b927..2b5754046080b6065e32e641c93d7a1cd1d62b3c 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 0c7023f12c43cba7454a56882bbcad619018096b..5f62ffd078d43f132b9f636695c428fe61c50336 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -22,6 +22,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/common.h"
 #include "libavutil/fifo.h"
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c
index 3e9f41d7e13a0ac5ef3c4913e0939b82cf0f3711..502f3607a13f4f9e6101d03e86d595ce103c82c7 100644
--- a/libavfilter/vsrc_movie.c
+++ b/libavfilter/vsrc_movie.c
@@ -29,6 +29,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index abcc42459640cf0d04baefbda0e9be8beb3c7c96..d4bffb394e3f9703b8cbc2ae4d5fde5167456d8d 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 "avformat.h"
 #include "internal.h"
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 0041ca4cc33f9b82bed955771d30913eada66a58..b994cc148abfa55343c2e54b0efbfe978df90491 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 "libavutil/mathematics.h"
 #include "avformat.h"
 #include "internal.h"
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index c71d545d4677d64f4885004cba1fcca53a4a68a8..6f80d2119a045b4345aba36712fe3b7dd897160f 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/avstring.h"
 #include "libavutil/bswap.h"
 #include "libavutil/dict.h"
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index e6730eb2f55496554799ec6c65fe9c894d99fc70..acc1dc41105708a333e11d0160c0641ebbc0ba9d 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 3dd4273eda683cb07cf9abe0d6b1d1a152b39fc7..f9e96780c2dee6a2038fe13f38876919a5fb442b 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 f3a35f89867ab10288f59ed805d436139afa653a..cc645a5a70aeed6db3d1c1bfcae80d4a608d6ca9 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 "avlanguage.h"
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 99ba23fafdacdbd04555001fe82c42b09998a786..9b019e183b80999e41c99f8e1e1b439a94bf3342 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 8f7153ace790f635c81a808151e933cb371808d8..43a164730c4159ae7aa799aa2c2c016d022197c6 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 85a12d69d8f4f513f6be1bcca5ac4738a5314ff9..13d5b0375c2786ad1ea89f94ad7d75511ebfd121 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 a947c6794d6cc6475f03c9de717a5fa31f323b99..91aded6163c88d09aab9250db13cc762ab296d9e 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/mathematics.h"
 #include "libavcodec/bytestream.h"
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index acce86c584e5d97062d954aa3bbed97cd9ab7182..2d3862d9e2bde1519e3d07d97cf183980290a627 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 e01c365125fb1ba1945faeeba508d837ba9b3497..e96cde7dea2b11286015c5c458b6eb1975be3f94 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 ab33aabccc21f494a77c165941514852cacc6e93..5d30bf8bd6a022bd72ee74168bc7b6c8f81d173a 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 42b47f8457ec99f62b5c4af7cc940e4d9ca31cff..0b22d8aa205414b6ee6385dcf1b83357cffcc017 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 e17cdccfd629cffb37eebdd9e6cc7c2c9399cb75..9be8db97845bc7617316f0da9c0b1014e83905fa 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 377fdd99a0e15fe290aeeafbf4040468956b31cd..ea1d927b5207b88fd27dd49879a240d1b7ee40ab 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 a3471fdf964159f179adb5f934fbff5cdcb9f03d..f65a66a0066b424468945e0be88b55106c086c91 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/log.h"
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index f4ff8157f84e674ce75c5e9de3670c5f7dd9fb69..45d74de0dde239a308df232d39440ad2b0b46e10 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 7859ec667559994cb968294016304bea462382fb..6249f901150b3e66984893b1fd2ce6bdee663125 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 79e398e41a719f476261e013d2968193b2a54727..253c495f4f6db25a50485e2eeee0ea2fab199756 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 caa6b1963b3425e2ac18c39d09bc7d4c19f7b216..eb40e1299030af22426391a2d7135eab33d6b324 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -30,6 +30,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 c96dfa9e6b78ef50eac8f2cf85c48232b468511f..25af4c5580f7db6ae64b965e7fc0dcc04e7bddc0 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"