diff --git a/Languages/Sources/HtmlCssJsPhp_Language.cpp b/Languages/Sources/HtmlCssJsPhp_Language.cpp
index 1c8977d..2181fe0 100644
--- a/Languages/Sources/HtmlCssJsPhp_Language.cpp
+++ b/Languages/Sources/HtmlCssJsPhp_Language.cpp
@@ -33,8 +33,9 @@
 	Created: 12/07/97 22:01:11 by Maarten Hekkelman
 */
 
-#include <cctype>
-#include <cstring>
+#include <ctype.h>
+#include <string.h>
+#include <strings.h>
 #include <stack>
 #include "CLanguageAddOn.h"
 #include "HColorUtils.h"
diff --git a/Languages/Sources/HtmlCssJsPhp_Popup.cpp b/Languages/Sources/HtmlCssJsPhp_Popup.cpp
index 83b4610..f325244 100644
--- a/Languages/Sources/HtmlCssJsPhp_Popup.cpp
+++ b/Languages/Sources/HtmlCssJsPhp_Popup.cpp
@@ -39,6 +39,7 @@
 */
 #include <map>
 #include <string>
+#include <strings.h>
 #include <vector>
 #include "CLanguageAddOn.h"
 
diff --git a/Languages/Sources/HtmlJs_Language.cpp b/Languages/Sources/HtmlJs_Language.cpp
index 7a4a42b..161863a 100644
--- a/Languages/Sources/HtmlJs_Language.cpp
+++ b/Languages/Sources/HtmlJs_Language.cpp
@@ -36,6 +36,8 @@
 #include "CLanguageAddOn.h"
 #include "HColorUtils.h"
 
+#include <strings.h>
+
 _EXPORT const char kLanguageName[] = "HTML-JS";
 _EXPORT const char kLanguageExtensions[] = "html;htm";
 _EXPORT const char kLanguageCommentStart[] = "<!";
diff --git a/Languages/Sources/HtmlJs_Popup.cpp b/Languages/Sources/HtmlJs_Popup.cpp
index eda1076..494f23c 100644
--- a/Languages/Sources/HtmlJs_Popup.cpp
+++ b/Languages/Sources/HtmlJs_Popup.cpp
@@ -35,6 +35,7 @@
 
 #include "CLanguageAddOn.h"
 #include <string>
+#include <strings.h>
 
 const long kMaxNameSize = 256;
 
diff --git a/Languages/Sources/Html_Popup.cpp b/Languages/Sources/Html_Popup.cpp
index 6ca71aa..2a17116 100644
--- a/Languages/Sources/Html_Popup.cpp
+++ b/Languages/Sources/Html_Popup.cpp
@@ -35,6 +35,7 @@
 
 #include "CLanguageAddOn.h"
 #include <string>
+#include <strings.h>
 
 const long kMaxNameSize = 256;
 
diff --git a/Languages/Sources/Lua_Popup.cpp b/Languages/Sources/Lua_Popup.cpp
index 6dbaaca..319489d 100644
--- a/Languages/Sources/Lua_Popup.cpp
+++ b/Languages/Sources/Lua_Popup.cpp
@@ -1,5 +1,6 @@
 #include <SupportDefs.h>
 #include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include "CLanguageAddOn.h"
 
diff --git a/Languages/Sources/Pascal_Popup.cpp b/Languages/Sources/Pascal_Popup.cpp
index ef20511..c3d5f02 100644
--- a/Languages/Sources/Pascal_Popup.cpp
+++ b/Languages/Sources/Pascal_Popup.cpp
@@ -36,6 +36,7 @@
 */
 
 #include "CLanguageAddOn.h"
+#include <strings.h>
 
 const int kMaxNameSize = 256;
 
diff --git a/Sources/pe.h b/Sources/pe.h
index 22a9492..f0d8044 100644
--- a/Sources/pe.h
+++ b/Sources/pe.h
@@ -88,13 +88,14 @@
 #include <UTF8.h>
 
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <stdio.h>
 
-#include <cstdarg>
-#include <ctime>
-#include <cerrno>
+#include <stdarg.h>
+#include <time.h>
+#include <errno.h>
 
 #include <vector>
 #include <set>
diff --git a/rez/Sources/SymbolTable.cpp b/rez/Sources/SymbolTable.cpp
index abcc40c..3bed13a 100644
--- a/rez/Sources/SymbolTable.cpp
+++ b/rez/Sources/SymbolTable.cpp
@@ -35,6 +35,7 @@
 
 #include "SymbolTable.h"
 #include <string.h>
+#include <strings.h>
 
 struct Node {
 	Node *left, *right;