-/* -------------------------------------------------------------------------
- * Project: GSocket (Generic Socket) for WX
- * Name: gsockmsw.h
- * Purpose: GSocket MSW header
- * CVSID: $Id$
- * -------------------------------------------------------------------------
- */
-
-#ifndef __GSOCK_MSW_H
-#define __GSOCK_MSW_H
-
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/msw/gsockmsw.h
+// Purpose: MSW-specific socket implementation
+// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
+// Created: April 1997
+// Copyright: (C) 1999-1997, Guilhem Lavaux
+// (C) 1999-2000, Guillermo Rodriguez Garcia
+// (C) 2008 Vadim Zeitlin
+// RCS_ID: $Id$
+// License: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef _WX_MSW_GSOCKMSW_H_
+#define _WX_MSW_GSOCKMSW_H_
+
+#include "wx/msw/wrapwin.h"
+
+#if defined(__CYGWIN__)
+ //CYGWIN gives annoying warning about runtime stuff if we don't do this
+# define USE_SYS_TYPES_FD_SET
+# include <sys/types.h>