diff --git a/AUTHORS b/AUTHORS
index 99c8ec452c..cca75e02ec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Alen Vrecko <alen.vrecko@gmail.com>
 Amazon Music <*@amazon.com>
 Anders Hasselqvist <anders.hasselqvist@gmail.com>
 Audible <*@audible.com>
+Cyfrowy Polsat SA <*@cyfrowypolsat.pl>
 Chun-da Chen <capitalm.c@gmail.com>
 Daniel Cantarín <canta@canta.com.ar>
 Dolby Laboratories <*@dolby.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index eeeeaa47fb..084f46a8a8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -40,6 +40,7 @@ Kongqun Yang <kqyang@google.com>
 Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
 Leo Law <leoltlaw.gh@gmail.com>
 Marcus Spangenberg <marcus.spangenberg@eyevinn.se>
+Michal Wierzbicki <mwierzbicki1@cyfrowypolsat.pl>
 Ole Andre Birkedal <o.birkedal@sportradar.com>
 Piotr Srebrny <srebrny.piotr@gmail.com>
 Qingquan Wang <wangqq1103@gmail.com>
diff --git a/packager/hls/base/tag.h b/packager/hls/base/tag.h
index 481fdc8126..e69f1fc56f 100644
--- a/packager/hls/base/tag.h
+++ b/packager/hls/base/tag.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_HLS_BASE_TAG_H_
 #define PACKAGER_HLS_BASE_TAG_H_
 
+#include <cstdint>
 #include <string>
 
 namespace shaka {
diff --git a/packager/hls/public/hls_params.h b/packager/hls/public/hls_params.h
index d1f7200f43..0f61a077c8 100644
--- a/packager/hls/public/hls_params.h
+++ b/packager/hls/public/hls_params.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_HLS_PUBLIC_HLS_PARAMS_H_
 #define PACKAGER_HLS_PUBLIC_HLS_PARAMS_H_
 
+#include <cstdint>
 #include <string>
 
 namespace shaka {
diff --git a/packager/media/base/buffer_writer.h b/packager/media/base/buffer_writer.h
index 6abc978dfe..5ea66cc7e2 100644
--- a/packager/media/base/buffer_writer.h
+++ b/packager/media/base/buffer_writer.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_BUFFER_WRITER_H_
 #define PACKAGER_MEDIA_BASE_BUFFER_WRITER_H_
 
+#include <cstdint>
 #include <vector>
 
 #include "packager/base/macros.h"
diff --git a/packager/media/base/fourccs.h b/packager/media/base/fourccs.h
index c721f2c81f..d7a73fe47e 100644
--- a/packager/media/base/fourccs.h
+++ b/packager/media/base/fourccs.h
@@ -5,6 +5,7 @@
 #ifndef PACKAGER_MEDIA_BASE_FOURCCS_H_
 #define PACKAGER_MEDIA_BASE_FOURCCS_H_
 
+#include <cstdint>
 #include <string>
 
 namespace shaka {
diff --git a/packager/media/base/id3_tag.h b/packager/media/base/id3_tag.h
index 963814aee7..9bd94a78f5 100644
--- a/packager/media/base/id3_tag.h
+++ b/packager/media/base/id3_tag.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_ID3_TAG_H_
 #define PACKAGER_MEDIA_BASE_ID3_TAG_H_
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/base/id3_tag_unittest.cc b/packager/media/base/id3_tag_unittest.cc
index fdbcdf3100..f70ddb73fc 100644
--- a/packager/media/base/id3_tag_unittest.cc
+++ b/packager/media/base/id3_tag_unittest.cc
@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <cstdint>
+
 #include "packager/media/base/id3_tag.h"
 
 #include <gmock/gmock.h>
diff --git a/packager/packager.h b/packager/packager.h
index 38494853ef..3b28c5426f 100644
--- a/packager/packager.h
+++ b/packager/packager.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_PACKAGER_H_
 #define PACKAGER_PACKAGER_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>