diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
index cfaa1c4d1d..7b38847ed7 100755
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
@@ -935,12 +935,10 @@ private static CharSequence generateFileHeader(
             "#if !defined(__STDC_LIMIT_MACROS)\n" +
             "#  define __STDC_LIMIT_MACROS 1\n" +
             "#endif\n" +
-            "#include <string.h>\n" +
-            "#include <stdint.h>\n" +
-            "#include <limits.h>\n" +
-            "#include <stdexcept>\n" +
             "#include <cstdint>\n" +
-            "#include <limits>\n\n" +
+            "#include <cstring>\n" +
+            "#include <limits>\n" +
+            "#include <stdexcept>\n\n" +
             "#if defined(WIN32) || defined(_WIN32)\n" +
             "#  define SBE_BIG_ENDIAN_ENCODE_16(v) _byteswap_ushort(v)\n" +
             "#  define SBE_BIG_ENDIAN_ENCODE_32(v) _byteswap_ulong(v)\n" +