diff --git a/src/libpw3270cpp/exception.cc b/src/libpw3270cpp/exception.cc
index ce4417d..0853ce1 100644
--- a/src/libpw3270cpp/exception.cc
+++ b/src/libpw3270cpp/exception.cc
@@ -27,6 +27,14 @@
  *
  */
 
+ #include <config.h>
+
+ #ifdef WIN32
+	#include <windows.h>
+ #else
+	#include <unistd.h>
+ #endif // WIN32
+
  #include <stdarg.h>
  #include <stdio.h>
  #include <string.h>
diff --git a/src/libpw3270cpp/session.cc b/src/libpw3270cpp/session.cc
index c8b4a5b..c3eb735 100644
--- a/src/libpw3270cpp/session.cc
+++ b/src/libpw3270cpp/session.cc
@@ -28,6 +28,13 @@
  */
 
  #include <config.h>
+
+ #ifdef WIN32
+	#include <windows.h>
+ #else
+	#include <unistd.h>
+ #endif // WIN32
+
  #include <stdarg.h>
  #include <stdio.h>
  #include <string.h>
@@ -35,9 +42,6 @@
 
  #include "private.h"
 
-#ifndef WIN32
- #include <unistd.h>
-#endif // !WIN32
 
 #ifdef HAVE_SYSLOG
 	#include <syslog.h>
--
libgit2 0.21.2