diff --git a/src/rhd_atombios.c b/src/rhd_atombios.c
index e7a358d..bf0a8d6 100644
--- a/src/rhd_atombios.c
+++ b/src/rhd_atombios.c
@@ -26,9 +26,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include <unistd.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
+
 #include "xf86Pci.h"
 #include "rhd.h"
 #include "rhd_atombios.h"
@@ -817,8 +820,7 @@ #define NAME_LEN 16
     mode->VRefresh = (1000.0 * ((float) mode->Clock))
 	/ ((float)(((float)mode->HTotal) * ((float)mode->VTotal)));
 
-    xf86snprintf(name, NAME_LEN, "%dx%d",
-		 mode->HDisplay, mode->VDisplay);
+    snprintf(name, NAME_LEN, "%dx%d", mode->HDisplay, mode->VDisplay);
     mode->name = xstrdup(name);
 
     RHDDebug(handle->scrnIndex,"%s: LVDS Modeline: %s  "
@@ -1954,7 +1956,7 @@ rhdAtomConnectorInfoFromSupportedDevices
 	cp[ncon].Output[0] = devices[n].ot;
 	cp[ncon].Output[1] = RHD_OUTPUT_NONE;
 	cp[ncon].Type = devices[n].con;
-	cp[ncon].Name = xf86strdup(devices[n].name);
+	cp[ncon].Name = xstrdup(devices[n].name);
 	cp[ncon].Name = RhdAppendString(cp[ncon].Name, devices[n].outputName);
 
 	if (devices[n].dual) {
diff --git a/src/rhd_connector.c b/src/rhd_connector.c
index a9c82fd..030bbd8 100644
--- a/src/rhd_connector.c
+++ b/src/rhd_connector.c
@@ -27,10 +27,9 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "xf86.h"
+#include <unistd.h> /* for usleep */
 
-/* for usleep */
-#include "xf86_ansic.h"
+#include "xf86.h"
 
 #include "rhd.h"
 #include "rhd_connector.h"
diff --git a/src/rhd_crtc.c b/src/rhd_crtc.c
index b213bc7..1bba6dd 100644
--- a/src/rhd_crtc.c
+++ b/src/rhd_crtc.c
@@ -27,10 +27,9 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "xf86.h"
+#include <unistd.h> /* for usleep */
 
-/* for usleep */
-#include "xf86_ansic.h"
+#include "xf86.h"
 
 #include "rhd.h"
 #include "rhd_crtc.h"
diff --git a/src/rhd_dac.c b/src/rhd_dac.c
index 7dae9a4..5e9ac38 100644
--- a/src/rhd_dac.c
+++ b/src/rhd_dac.c
@@ -27,10 +27,9 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "xf86.h"
+#include <unistd.h> /* for usleep */
 
-/* for usleep */
-#include "xf86_ansic.h"
+#include "xf86.h"
 
 #include "rhd.h"
 #include "rhd_connector.h"
diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index 2137806..5a7b9bd 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -27,6 +27,8 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <unistd.h> /* for usleep */
+
 #ifdef ATOM_BIOS_PARSER
 # define ATOM_ASIC_INIT
 #endif
@@ -38,9 +40,6 @@ #include "xf86_OSproc.h"
 /* For PIO/MMIO */
 #include "compiler.h"
 
-/* for usleep */
-#include "xf86_ansic.h"
-
 #include "xf86Resources.h"
 
 #include "xf86PciInfo.h"
diff --git a/src/rhd_helper.c b/src/rhd_helper.c
index c9f3f9a..fdd9444 100644
--- a/src/rhd_helper.c
+++ b/src/rhd_helper.c
@@ -27,8 +27,9 @@ #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <unistd.h>
+
 #include "xf86.h"
-#include "xf86_ansic.h"
 
 #include "rhd.h"
 
@@ -112,12 +113,12 @@ RhdDebugDump(int scrnIndex, unsigned cha
 	char *d = c;
 	int k = size < 16 ? size : 16;
 	for (i = 0; i < k; i++)
-	    cur += xf86snprintf(cur,4,"%2.2x ",(unsigned char) (*(c++)));
+	    cur += snprintf(cur,4,"%2.2x ",(unsigned char) (*(c++)));
 	c = d;
 	for (i = 0; i < k; i++) {
-	    cur += xf86snprintf(cur,2,"%c",((((CARD8)(*c)) > 32)
-				&& (((CARD8)(*c)) < 128)) ?
-				(unsigned char) (*(c)): '.');
+	    cur += snprintf(cur, 2, "%c",
+			    ((((CARD8)(*c)) > 32) && (((CARD8)(*c)) < 128)) ?
+			    (unsigned char) (*(c)) : '.');
 	    c++;
 	}
 	xf86DrvMsg(scrnIndex,X_INFO,"%s\n",line);
@@ -177,15 +178,15 @@ RhdAppendString(char *s1, const char *s2
     if (!s2)
 	return s1;
     else if (!s1)
-	return xf86strdup(s2);
+	return xstrdup(s2);
     else {
 	int len = strlen(s1) + strlen(s2) + 1;
 	char *result  = (char *)xalloc(len);
 
 	if (!result) return s1;
 
-	xf86strcpy(result,s1);
-	xf86strcat(result,s2);
+	strcpy(result,s1);
+	strcat(result,s2);
 	xfree(s1);
 	return result;
     }
diff --git a/src/rhd_i2c.c b/src/rhd_i2c.c
index 3f8f43e..cb2f19a 100644
--- a/src/rhd_i2c.c
+++ b/src/rhd_i2c.c
@@ -27,9 +27,10 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <unistd.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86i2c.h"
 
 #include "rhd.h"
@@ -759,7 +760,7 @@ rhdInitI2C(int scrnIndex)
 	    xf86DestroyI2CBusRec(I2CPtr, TRUE, FALSE);
 	    goto error;
 	}
-	xf86snprintf(I2CPtr->BusName,17,"RHD I2C line %1.1i",i);
+        snprintf(I2CPtr->BusName, 17, "RHD I2C line %1.1i", i);
 	I2CPtr->scrnIndex = scrnIndex;
 	if (rhdPtr->ChipSet < RHD_RS690)
 	    I2CPtr->I2CWriteRead = rhd5xxWriteRead;
diff --git a/src/rhd_lvtma.c b/src/rhd_lvtma.c
index a3ef151..4391ca5 100644
--- a/src/rhd_lvtma.c
+++ b/src/rhd_lvtma.c
@@ -32,10 +32,9 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "xf86.h"
+#include <unistd.h> /* for usleep */
 
-/* for usleep */
-#include "xf86_ansic.h"
+#include "xf86.h"
 
 #include "rhd.h"
 #include "rhd_crtc.h"
diff --git a/src/rhd_pll.c b/src/rhd_pll.c
index 9522d15..69da817 100644
--- a/src/rhd_pll.c
+++ b/src/rhd_pll.c
@@ -27,10 +27,9 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "xf86.h"
+#include <unistd.h> /* for usleep */
 
-/* for usleep */
-#include "xf86_ansic.h"
+#include "xf86.h"
 
 #include "rhd.h"
 #include "rhd_pll.h"
diff --git a/src/rhd_tmds.c b/src/rhd_tmds.c
index c45aec3..9521258 100644
--- a/src/rhd_tmds.c
+++ b/src/rhd_tmds.c
@@ -32,10 +32,9 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "xf86.h"
+#include <unistd.h> /* for usleep */
 
-/* for usleep */
-#include "xf86_ansic.h"
+#include "xf86.h"
 
 #include "rhd.h"
 #include "rhd_crtc.h"