diff --git a/lang/c++/impl/DataFile.cc b/lang/c++/impl/DataFile.cc
index 66281ae9820..8fb4a1abaa7 100644
--- a/lang/c++/impl/DataFile.cc
+++ b/lang/c++/impl/DataFile.cc
@@ -183,7 +183,7 @@ void DataFileWriterBase::sync() {
         crc.process_bytes(reinterpret_cast<const char *>(temp.data()),
                           temp.size());
         // For Snappy, add the CRC32 checksum
-        int32_t checksum = crc();
+        auto checksum = crc();
 
         // Now compress
         size_t compressed_size = snappy::Compress(
@@ -408,7 +408,7 @@ void DataFileReaderBase::readDataBlock() {
                 "Snappy Compression reported an error when decompressing");
         }
         crc.process_bytes(uncompressed.c_str(), uncompressed.size());
-        uint32_t c = crc();
+        auto c = crc();
         if (checksum != c) {
             throw Exception(
                 "Checksum did not match for Snappy compression: Expected: {}, computed: {}",
diff --git a/lang/c++/impl/Node.cc b/lang/c++/impl/Node.cc
index bde556bf314..fd9ee9d6dcf 100644
--- a/lang/c++/impl/Node.cc
+++ b/lang/c++/impl/Node.cc
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+#include <algorithm>
 #include <cmath>
 #include <unordered_set>
 
diff --git a/lang/c++/impl/parsing/Symbol.hh b/lang/c++/impl/parsing/Symbol.hh
index c8760c34dfa..bbba58e6a0e 100644
--- a/lang/c++/impl/parsing/Symbol.hh
+++ b/lang/c++/impl/parsing/Symbol.hh
@@ -19,6 +19,7 @@
 #ifndef avro_parsing_Symbol_hh__
 #define avro_parsing_Symbol_hh__
 
+#include <algorithm>
 #include <map>
 #include <set>
 #include <sstream>