Not necessary to include windows.h if winsock2.h is already included.  If both are included, then winsock2.h must be included first.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4059 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 2e0c3a4..511c412 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -16,7 +16,6 @@
  * USA.
  */
 
-#include <windows.h>
 #include <winsock2.h>
 #include <vncviewer/UserPasswdDialog.h>
 #include <vncviewer/CConn.h>
diff --git a/win/vncviewer/ListenServer.h b/win/vncviewer/ListenServer.h
index a7676a2..d94b58b 100644
--- a/win/vncviewer/ListenServer.h
+++ b/win/vncviewer/ListenServer.h
@@ -21,7 +21,6 @@
 #ifndef __RFB_WIN32_LISTEN_SERVER_H__
 #define __RFB_WIN32_LISTEN_SERVER_H__
 
-#include <windows.h>
 #include <winsock2.h>
 #include <network/Socket.h>
 #include <rfb_win32/MsgWindow.h>
diff --git a/win/vncviewer/vncviewer.cxx b/win/vncviewer/vncviewer.cxx
index 4e2c7b2..8a741f7 100644
--- a/win/vncviewer/vncviewer.cxx
+++ b/win/vncviewer/vncviewer.cxx
@@ -24,11 +24,11 @@
 #endif
 #include <list>
 
+#include <vncviewer/ListenServer.h>
 #include <vncviewer/resource.h>
 #include <vncviewer/CConn.h>
 #include <vncviewer/CConnThread.h>
 #include <vncviewer/OptionsDialog.h>
-#include <vncviewer/ListenServer.h>
 #include <vncviewer/ListenTrayIcon.h>
 #include <network/TcpSocket.h>
 #include <rfb/Logger_stdio.h>