Merge BUG: Windows target won't compile.

 - winsock2.h must be included before windows.h

server-tools/instance-manager/WindowsService.cpp

@@ -13,9 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
-#include <windows.h>
-
 #include "my_global.h"
+#include <windows.h>
 #include "WindowsService.h"
 
 static WindowsService *gService;