diff --git a/src/include/lib3270/session.h b/src/include/lib3270/session.h
index 1798beb..0fe758e 100644
--- a/src/include/lib3270/session.h
+++ b/src/include/lib3270/session.h
@@ -31,7 +31,14 @@
 
 	#define LIB3270_SESSION_H_INCLUDED 1
 
-	#include <sys/socket.h>
+	#ifdef WIN32
+		#include <winsock2.h>
+		#include <windows.h>
+		#include <ws2tcpip.h>
+	#else
+		#include <sys/socket.h>
+	#endif // WIN32
+
 	#include <lib3270/popup.h>
 
 	struct lib3270_session_callbacks
diff --git a/src/lib3270/api.h b/src/lib3270/api.h
index 904877a..0fdd5a1 100644
--- a/src/lib3270/api.h
+++ b/src/lib3270/api.h
@@ -32,6 +32,11 @@
 
 #ifndef LIB3270_API_INCLUDED
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
+
 #ifdef __cplusplus
 	extern "C" {
 #endif
diff --git a/src/lib3270/ft.c b/src/lib3270/ft.c
index c3c84b5..cbbebca 100644
--- a/src/lib3270/ft.c
+++ b/src/lib3270/ft.c
@@ -29,6 +29,11 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
+
 #include <lib3270/config.h>
 #include <lib3270.h>
 #include <lib3270/filetransfer.h>
diff --git a/src/lib3270/ft_dft.c b/src/lib3270/ft_dft.c
index d9adb15..1a4a2f1 100644
--- a/src/lib3270/ft_dft.c
+++ b/src/lib3270/ft_dft.c
@@ -34,6 +34,11 @@
  *		File transfer: DFT-style data processing functions
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
+
 #include <lib3270.h>
 #include "private.h"
 
diff --git a/src/lib3270/html.c b/src/lib3270/html.c
index 761ebda..38bad86 100644
--- a/src/lib3270/html.c
+++ b/src/lib3270/html.c
@@ -25,12 +25,16 @@
  * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
  *
  */
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
 
  #include <string.h>
  #include <stdlib.h>
  #include <lib3270.h>
  #include <lib3270/session.h>
-#include "3270ds.h"
+ #include "3270ds.h"
  #include <lib3270/html.h>
 
  #include "private.h"
diff --git a/src/lib3270/log.c b/src/lib3270/log.c
index 9c25ec1..f7c7587 100644
--- a/src/lib3270/log.c
+++ b/src/lib3270/log.c
@@ -30,6 +30,11 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <lib3270/config.h>
diff --git a/src/lib3270/macros.c b/src/lib3270/macros.c
index 936e44f..e459704 100644
--- a/src/lib3270/macros.c
+++ b/src/lib3270/macros.c
@@ -30,6 +30,11 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
+
  #include <errno.h>
  #include <string.h>
  #include <stdio.h>
diff --git a/src/lib3270/private.h b/src/lib3270/private.h
index 59bfecf..09cd3ff 100644
--- a/src/lib3270/private.h
+++ b/src/lib3270/private.h
@@ -27,6 +27,11 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
+
 /* Autoconf settings. */
 #include <lib3270/config.h>		/* autoconf settings */
 #include <lib3270.h>			/* lib3270 API calls and defs */
diff --git a/src/lib3270/toggles.c b/src/lib3270/toggles.c
index b9b5758..b097b53 100644
--- a/src/lib3270/toggles.c
+++ b/src/lib3270/toggles.c
@@ -39,7 +39,11 @@
 #include <errno.h>
 #include <sys/types.h>
 
-#ifndef WIN32
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <ws2tcpip.h>
+#else
 	#include <sys/socket.h>
 #endif // !WIN32
 
diff --git a/src/pw3270/v3270/draw.c b/src/pw3270/v3270/draw.c
index b4a58bf..cff5642 100644
--- a/src/pw3270/v3270/draw.c
+++ b/src/pw3270/v3270/draw.c
@@ -27,6 +27,12 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <ws2tcpip.h>
+#endif // WIN32
+
  #include <gtk/gtk.h>
  #include <math.h>
  #include <pw3270.h>
diff --git a/src/pw3270/v3270/mouse.c b/src/pw3270/v3270/mouse.c
index ca13f11..b3035f4 100644
--- a/src/pw3270/v3270/mouse.c
+++ b/src/pw3270/v3270/mouse.c
@@ -98,7 +98,7 @@ static void button_1_press(GtkWidget *widget, GdkEventType type, int baddr)
 		break;
 
 	case GDK_2BUTTON_PRESS:		// Double click - Select word
-		if(lib3270_select_word_at(GTK_V3270(widget)->host,baddr));
+		if(lib3270_select_word_at(GTK_V3270(widget)->host,baddr))
 			lib3270_ring_bell(GTK_V3270(widget)->host);
 		break;
 
diff --git a/src/pw3270/v3270/oia.c b/src/pw3270/v3270/oia.c
index 2f89150..2a9b5f5 100644
--- a/src/pw3270/v3270/oia.c
+++ b/src/pw3270/v3270/oia.c
@@ -27,6 +27,12 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <ws2tcpip.h>
+#endif // WIN32
+
  #include <pw3270.h>
  #include <lib3270.h>
  #include <lib3270/session.h>
diff --git a/src/pw3270/v3270/properties.c b/src/pw3270/v3270/properties.c
index b7a46fd..7c1bedd 100644
--- a/src/pw3270/v3270/properties.c
+++ b/src/pw3270/v3270/properties.c
@@ -27,6 +27,12 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <ws2tcpip.h>
+#endif // WIN32
+
  #include <gtk/gtk.h>
  #include <lib3270.h>
  #include <lib3270/session.h>
diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c
index 8e96084..d302c29 100644
--- a/src/pw3270/v3270/widget.c
+++ b/src/pw3270/v3270/widget.c
@@ -27,6 +27,12 @@
  *
  */
 
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <ws2tcpip.h>
+#endif // WIN32
+
  #include <gtk/gtk.h>
  #include <pw3270.h>
  #include <lib3270.h>
@@ -336,7 +342,7 @@ static void v3270_class_init(v3270Class *klass)
 #ifdef WIN32
 		// http://git.gnome.org/browse/gtk+/tree/gdk/win32/gdkcursor-win32.c
 		// http://www.functionx.com/win32/Lesson02b.htm
-		static const gchar	* cr[V3270_CURSOR_COUNT] =
+		static const gchar	* cr[LIB3270_POINTER_COUNT] =
 		{
 			"ibeam",	//	V3270_CURSOR_UNPROTECTED
 			"wait",		//	V3270_CURSOR_WAITING
--
libgit2 0.21.2