diff --git a/common/network/Makefile.am b/common/network/Makefile.am
index 61d276b..c4bad93 100644
--- a/common/network/Makefile.am
+++ b/common/network/Makefile.am
@@ -4,5 +4,5 @@
 
 libnetwork_la_SOURCES = $(HDRS) TcpSocket.cxx
 
-libnetwork_la_CPPFLAGS = -I$(top_srcdir) @SOCKLEN_T_DEFINE@
+libnetwork_la_CPPFLAGS = -I$(top_srcdir)
 
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index 5dd2428..777627b 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_COMMON_CONFIG_H
+#include <common-config.h>
+#endif
+
 #ifdef WIN32
 //#include <io.h>
 #include <winsock2.h>
@@ -42,10 +46,6 @@
 #include <rfb/util.h>
 #include <rfb/LogWriter.h>
 
-#ifndef VNC_SOCKLEN_T
-#define VNC_SOCKLEN_T int
-#endif
-
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned long)-1)
 #endif