diff --git a/src/terminal/charset.c b/src/terminal/charset.c
index be749f9..c1ed312 100644
--- a/src/terminal/charset.c
+++ b/src/terminal/charset.c
@@ -27,16 +27,20 @@
  *
  */
 
+ #include <config.h>
+
+ #ifdef _WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <lmcons.h>
+ #endif // _WIN32
+
  #include <terminal.h>
  #include <v3270.h>
  #include <lib3270/charset.h>
  #include <lib3270/log.h>
  #include <v3270/dialogs.h>
 
-#ifdef _WIN32
-	#include <lmcons.h>
-#endif // _WIN32
-
  #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME)
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
diff --git a/src/terminal/windows/iosource.c b/src/terminal/windows/iosource.c
index ad54e59..922b469 100644
--- a/src/terminal/windows/iosource.c
+++ b/src/terminal/windows/iosource.c
@@ -28,6 +28,12 @@
  */
 
  #include <config.h>
+
+ #ifdef _WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+ #endif // _WIN32
+
  #include <terminal.h>
 
 /*---[ Structs ]-------------------------------------------------------------------------------------------*/
--
libgit2 0.21.2