diff --git a/snappy-sinksource.cc b/snappy-sinksource.cc
index b161797..605a2cb 100644
--- a/snappy-sinksource.cc
+++ b/snappy-sinksource.cc
@@ -26,7 +26,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cstddef>
+#include <stddef.h>
 #include <cstring>
 
 #include "snappy-sinksource.h"
diff --git a/snappy-stubs-internal.h b/snappy-stubs-internal.h
index 2a7af30..0e62e73 100644
--- a/snappy-stubs-internal.h
+++ b/snappy-stubs-internal.h
@@ -35,15 +35,14 @@
 #include "config.h"
 #endif
 
-#include <cstdint>
+#include <stdint.h>
+
+#include <cassert>
+#include <cstdlib>
 #include <cstring>
 #include <limits>
 #include <string>
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
diff --git a/snappy-test.h b/snappy-test.h
index 603f486..682998b 100644
--- a/snappy-test.h
+++ b/snappy-test.h
@@ -31,14 +31,13 @@
 #ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
 #define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_TEST_H_
 
+#include <cstdarg>
+#include <cstdio>
 #include <iostream>
 #include <string>
 
 #include "snappy-stubs-internal.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
diff --git a/snappy.cc b/snappy.cc
index 0aab795..6daddc0 100644
--- a/snappy.cc
+++ b/snappy.cc
@@ -68,9 +68,8 @@
 #include <immintrin.h>
 #endif
 
-#include <stdio.h>
-
 #include <algorithm>
+#include <cstdio>
 #include <cstring>
 #include <string>
 #include <vector>
diff --git a/snappy.h b/snappy.h
index c8352aa..e4fdad3 100644
--- a/snappy.h
+++ b/snappy.h
@@ -39,8 +39,9 @@
 #ifndef THIRD_PARTY_SNAPPY_SNAPPY_H__
 #define THIRD_PARTY_SNAPPY_SNAPPY_H__
 
-#include <cstddef>
-#include <cstdint>
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "snappy-stubs-public.h"
diff --git a/snappy_compress_fuzzer.cc b/snappy_compress_fuzzer.cc
index 1d0119e..1d4429a 100644
--- a/snappy_compress_fuzzer.cc
+++ b/snappy_compress_fuzzer.cc
@@ -28,9 +28,10 @@
 //
 // libFuzzer harness for fuzzing snappy compression code.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <cassert>
-#include <cstddef>
-#include <cstdint>
 #include <string>
 
 #include "snappy.h"
diff --git a/snappy_uncompress_fuzzer.cc b/snappy_uncompress_fuzzer.cc
index 8071c00..385bfb5 100644
--- a/snappy_uncompress_fuzzer.cc
+++ b/snappy_uncompress_fuzzer.cc
@@ -28,9 +28,10 @@
 //
 // libFuzzer harness for fuzzing snappy's decompression code.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <cassert>
-#include <cstddef>
-#include <cstdint>
 #include <string>
 
 #include "snappy.h"
diff --git a/snappy_unittest.cc b/snappy_unittest.cc
index db44c90..c4c85fd 100644
--- a/snappy_unittest.cc
+++ b/snappy_unittest.cc
@@ -26,8 +26,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include <algorithm>
 #include <random>