3 files changed, 11 insertions, 12 deletions
diff --git a/src/ccapi/common/cci_common.h b/src/ccapi/common/cci_common.h
index 09b4892ce..b961ffdb9 100644
--- a/src/ccapi/common/cci_common.h
+++ b/src/ccapi/common/cci_common.h
@@ -27,26 +27,25 @@
 #ifndef CCI_COMMON_H
 #define CCI_COMMON_H
 
+#include <CredentialsCache.h>
+
 #include <sys/types.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <com_err.h>
 
 #if TARGET_OS_MAC
-#include <stdint.h>
 #include <unistd.h>
 #define VECTOR_FUNCTIONS_INITIALIZER ,NULL
 #else
 #include "win-mac.h"
 #define VECTOR_FUNCTIONS_INITIALIZER
+/* hide "#pragma mark" warnings on Windows */
 #pragma warning (disable: 4068)
 #endif
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <com_err.h>
-
-#include <CredentialsCache.h>
-
 #define k_cci_context_initial_ccache_name "Initial default ccache"
 
 #include "cci_cred_union.h"
diff --git a/src/ccapi/server/ccs_common.h b/src/ccapi/server/ccs_common.h
index 2013c9e10..42a427c08 100644
--- a/src/ccapi/server/ccs_common.h
+++ b/src/ccapi/server/ccs_common.h
@@ -29,6 +29,8 @@
 
 #include "cci_common.h"
 
+#include <time.h>
+
 #include "ccs_array.h"
 #include "ccs_list.h"
 #include "ccs_cache_collection.h"
diff --git a/src/include/CredentialsCache.h b/src/include/CredentialsCache.h
index c2e472038..43705e571 100644
--- a/src/include/CredentialsCache.h
+++ b/src/include/CredentialsCache.h
@@ -34,7 +34,7 @@
 #if defined(_WIN32)
 #include <winsock.h>
 #else
-#include <sys/types.h>
+#include <stdint.h>
 #endif
 
 #ifdef __cplusplus
@@ -58,8 +58,6 @@ extern "C" {
 #define CCACHE_API
 #endif
 
-#include <time.h>
-
 /*
  * Constants
  */