diff --git a/src/processor/range_map.h b/src/processor/range_map.h
index 1499ff29..05c65975 100644
--- a/src/processor/range_map.h
+++ b/src/processor/range_map.h
@@ -40,7 +40,7 @@
 #define PROCESSOR_RANGE_MAP_H__
 
 
-#include <cstdint>
+#include <stdint.h>
 #include <map>
 
 
diff --git a/src/processor/range_map_unittest.cc b/src/processor/range_map_unittest.cc
index 1bf9af24..568df367 100644
--- a/src/processor/range_map_unittest.cc
+++ b/src/processor/range_map_unittest.cc
@@ -35,6 +35,7 @@
 #include <config.h>  // Must come first
 #endif
 
+#include <inttypes.h>
 #include <limits.h>
 #include <stdio.h>
 
@@ -504,7 +505,7 @@ static bool RunTests() {
     // The RangeMap's own count of objects should also match.
     if (range_map->GetCount() != stored_count) {
       fprintf(stderr, "FAILED: stored object count doesn't match GetCount, "
-              "expected %d, observed %ld\n",
+              "expected %d, observed %" PRId64 "\n",
               stored_count, range_map->GetCount());
 
       return false;