9 files changed, 1 insertions, 29 deletions
diff --git a/xorg-server/config/config.c b/xorg-server/config/config.c
index 7566748b9..5a7b0ea17 100644
--- a/xorg-server/config/config.c
+++ b/xorg-server/config/config.c
@@ -32,10 +32,6 @@
 #include "hotplug.h"
 #include "config-backends.h"
 
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
-
 void
 config_init(void)
 {
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index c701c9fbe..1cc5a9161 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -74,10 +74,6 @@ Equipment Corporation.
 #include "xf86bigfontsrv.h"
 #endif
 
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
-
 #define QUERYCHARINFO(pci, pr)  *(pr) = (pci)->metrics
 
 extern pointer fosNaturalParams;
diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index 778e0a3f0..9e6ba0325 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -35,9 +35,6 @@
 #include "xace.h"
 #include "xkbsrv.h"
 #include "xkbstr.h"
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
 
 /* Check if a button map change is okay with the device.
  * Returns -1 for BadValue, as it collides with MappingBusy. */
diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index 271d698d0..e4f0b5559 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -48,10 +48,6 @@
 #include "glxext.h"
 #include "protocol-versions.h"
 
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
-
 static DevPrivateKeyRec glxScreenPrivateKeyRec;
 #define glxScreenPrivateKey (&glxScreenPrivateKeyRec)
 
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index ce58c0a05..bc0d24841 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -80,10 +80,6 @@
 #include "win.h"
 #include <winmsg.h>
 
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
-
 extern Bool			g_fXdmcpEnabled;
 extern Bool g_fNativeGl;
 
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index 7a9566d26..4c474464f 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -79,6 +79,7 @@ OF THIS SOFTWARE.
 #include <X11/Xdefs.h>
 
 #include <stddef.h>
+#include <unistd.h>
 
 #ifdef _MSC_VER
 #define inline __inline
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index d8ca6c822..f3ecf781c 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -122,10 +122,6 @@ __stdcall unsigned long GetTickCount(void);
 
 #include "picture.h"
 
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
-
 Bool noTestExtensions;
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index b8fd71776..127180a34 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -74,8 +74,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef WIN32
 
-#define strdup _strdup
-
 #include <X11/Xwindows.h>
 const char* 
 Win32TempDir()
diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c
index 63c99e51b..b0e643e62 100644
--- a/xorg-server/xkb/xkbUtils.c
+++ b/xorg-server/xkb/xkbUtils.c
@@ -69,10 +69,6 @@ DEALINGS IN THE SOFTWARE.
 #include "xkbgeom.h"
 #include "xkb.h"
 
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
-
 /***====================================================================***/
 
 int