Drop libc wrapper; don't include xf86_ansic.h and add includes now missing.

20 files changed, 28 insertions, 20 deletions

diff --git a/src/i810.h b/src/i810.h
index 35143166..f7856c86 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -39,7 +39,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _I810_H_
 #define _I810_H_
 
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i810_accel.c b/src/i810_accel.c
index f946ae2a..efbe2907 100644
--- a/src/i810_accel.c
+++ b/src/i810_accel.c
@@ -50,7 +50,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-#include "xf86_ansic.h"
 #include "xf86.h"
 #include "xaarop.h"
 #include "i810.h"
diff --git a/src/i810_cursor.c b/src/i810_cursor.c
index 85c4e254..c293a3d5 100644
--- a/src/i810_cursor.c
+++ b/src/i810_cursor.c
@@ -55,7 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 #include "xf86fbman.h"
diff --git a/src/i810_dga.c b/src/i810_dga.c
index e6713331..4ab7a3df 100644
--- a/src/i810_dga.c
+++ b/src/i810_dga.c
@@ -42,7 +42,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xaa.h"
diff --git a/src/i810_dri.c b/src/i810_dri.c
index 82fb0594..2257ee58 100644
--- a/src/i810_dri.c
+++ b/src/i810_dri.c
@@ -16,9 +16,12 @@
 #include "config.h"
 #endif
 
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Priv.h"
 
 #include "xf86PciInfo.h"
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 54395a78..ac50f7dc 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -60,11 +60,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * DGA
  */
 
+#include <math.h>
+#include <string.h>
+
 /*
  * These are X and server generic header files.
  */
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
 #include "xf86RAC.h"
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c
index 5d253236..36d80880 100644
--- a/src/i810_hwmc.c
+++ b/src/i810_hwmc.c
@@ -38,10 +38,11 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i810_io.c b/src/i810_io.c
index 8d097f21..abe1d6f0 100644
--- a/src/i810_io.c
+++ b/src/i810_io.c
@@ -50,7 +50,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
 
diff --git a/src/i810_memory.c b/src/i810_memory.c
index 816e5d80..56199ce6 100644
--- a/src/i810_memory.c
+++ b/src/i810_memory.c
@@ -50,7 +50,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include "i810.h"
diff --git a/src/i810_video.c b/src/i810_video.c
index f420d2f2..769db0f2 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -38,10 +38,11 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i830.h b/src/i830.h
index 660cba60..d2276629 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -47,7 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _I830_H_
 #define _I830_H_
 
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 7211f4bd..a11f64b9 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -58,7 +58,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-#include "xf86_ansic.h"
 #include "xf86.h"
 #include "xaarop.h"
 #include "i830.h"
diff --git a/src/i830_cursor.c b/src/i830_cursor.c
index b35b0ec8..c3e0ff72 100644
--- a/src/i830_cursor.c
+++ b/src/i830_cursor.c
@@ -58,9 +58,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 #include "xf86fbman.h"
diff --git a/src/i830_dga.c b/src/i830_dga.c
index e5bcfc72..1129fa31 100644
--- a/src/i830_dga.c
+++ b/src/i830_dga.c
@@ -42,7 +42,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xaa.h"
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 06bccccb..283b513b 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -62,9 +62,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <stdio.h>
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Priv.h"
 
 #include "xf86PciInfo.h"
diff --git a/src/i830_driver.c b/src/i830_driver.c
index fb748752..2a356d30 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -160,8 +160,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define PRINT_MODE_INFO 0
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
 #include "xf86RAC.h"
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 84de2c3e..68626227 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -54,8 +54,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 #include "i830.h"
diff --git a/src/i830_modes.c b/src/i830_modes.c
index a992bb60..8938548a 100644
--- a/src/i830_modes.c
+++ b/src/i830_modes.c
@@ -38,8 +38,10 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+#include <string.h>
+
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "vbe.h"
 #include "vbeModes.h"
 #include "i830.h"
diff --git a/src/i830_rotate.c b/src/i830_rotate.c
index 364f9696..e4a80645 100644
--- a/src/i830_rotate.c
+++ b/src/i830_rotate.c
@@ -49,8 +49,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 #include "servermd.h"
 #include "shadow.h"
diff --git a/src/i830_video.c b/src/i830_video.c
index b655280d..7062d0f5 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -64,10 +64,12 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "config.h"
 #endif
 
+#include <math.h>
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"