diff --git a/api/boinc_api.C b/api/boinc_api.C
index bc60e94d0e..b08e519c53 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -39,6 +39,7 @@
 
 #include "parse.h"
 #include "error_numbers.h"
+#include "file_names.h"
 
 #include "boinc_api.h"
 
diff --git a/client/client_types.h b/client/client_types.h
index d31ef49ca1..f320163b69 100644
--- a/client/client_types.h
+++ b/client/client_types.h
@@ -24,7 +24,11 @@
 
 #ifndef _CLIENT_TYPES_
 #define _CLIENT_TYPES_
+
+#ifdef _WIN32
 #include <windows_cpp.h>
+#endif
+
 #include <vector>
 #include <stdio.h>