diff --git a/CheckBufferOverrun.cpp b/CheckBufferOverrun.cpp
index c08fd848f..cf34db176 100644
--- a/CheckBufferOverrun.cpp
+++ b/CheckBufferOverrun.cpp
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <sstream>
 #include <list>
+#include <cstring>
 
 #include <stdlib.h>     // <- strtoul
 
diff --git a/CheckClass.cpp b/CheckClass.cpp
index 7e210c4d7..f463059ab 100644
--- a/CheckClass.cpp
+++ b/CheckClass.cpp
@@ -6,6 +6,7 @@
 #include <list>
 #include <string>
 #include <sstream>
+#include <cstring>
 
 
 #ifdef __BORLANDC__
diff --git a/CheckHeaders.cpp b/CheckHeaders.cpp
index 2cbe2dc00..930ac558f 100644
--- a/CheckHeaders.cpp
+++ b/CheckHeaders.cpp
@@ -6,6 +6,7 @@
 #include <list>
 #include <sstream>
 #include <string>
+#include <cstring>
 //---------------------------------------------------------------------------
 
 
diff --git a/CheckOther.cpp b/CheckOther.cpp
index 3258e0227..18f55621c 100644
--- a/CheckOther.cpp
+++ b/CheckOther.cpp
@@ -4,7 +4,8 @@
 #include "CommonCheck.h"
 #include <list>
 #include <sstream>
-#include <stdlib.h>     // <- atoi
+#include <stdlib.h>     // <- atoi
+#include <cstring>
 //---------------------------------------------------------------------------
 
 
diff --git a/CommonCheck.cpp b/CommonCheck.cpp
index 6b0c4f32a..79c190499 100644
--- a/CommonCheck.cpp
+++ b/CommonCheck.cpp
@@ -5,7 +5,8 @@
 #include <iostream>
 #include <sstream>
 #include <list>
-#include <algorithm>
+#include <algorithm>
+#include <cstring>
 //---------------------------------------------------------------------------
 extern bool CheckCodingStyle;
 bool OnlyReportUniqueErrors;
diff --git a/main.cpp b/main.cpp
index e2e056fc0..d1788ce86 100644
--- a/main.cpp
+++ b/main.cpp
@@ -29,7 +29,9 @@
 
 #include <algorithm>
 #include <iostream>
-#include <sstream>
+#include <sstream>
+#include <cstring>
+
 
 #ifdef __BORLANDC__
 #include <dir.h>
diff --git a/tokenize.cpp b/tokenize.cpp
index 863e97e25..9db6cc0dd 100644
--- a/tokenize.cpp
+++ b/tokenize.cpp
@@ -8,6 +8,7 @@
 
 #include <map>
 #include <string>
+#include <cstring>
 
 #include <stdlib.h>     // <- strtoul
 #include <stdio.h>
@@ -683,7 +684,7 @@ void SimplifyTokenList()
             free(tok->str);
             char str[10];
             // 'sizeof(type *)' has the same size as 'sizeof(char *)'
-            sprintf( str, "%lu", sizeof(char *));
+            sprintf( str, "%u", (unsigned int)sizeof(char *));
             tok->str = strdup( str );
 
             for (int i = 0; i < 4; i++)