diff --git a/configure.ac b/configure.ac
diff --git a/src/ast.h b/src/ast.h
index e1f0426..fdcd4e6 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -20,8 +20,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <string.h>
-#include <stdlib.h>
+#include "xaa.h"
+#include "xf86Cursor.h"
 
 /* Compiler Options */
 #define	Accel_2D
diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
index afbac7c..2075038 100644
--- a/src/ast_2dtool.c
+++ b/src/ast_2dtool.c
@@ -20,44 +20,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef	Accel_2D
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
-#include "xf86cmap.h"
-#include "compiler.h"
-#include "mibstore.h"
-#include "vgaHW.h"
-#include "mipointer.h"
-#include "micmap.h"
-
-#include "fb.h"
-#include "regionstr.h"
-#include "xf86xv.h"
-#include <X11/extensions/Xv.h>
-#include "vbe.h"
-
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-
-/* framebuffer offscreen manager */
-#include "xf86fbman.h"
-
-/* include xaa includes */
-#include "xaa.h"
-#include "xaarop.h"
-
-/* H/W cursor support */
-#include "xf86Cursor.h"
 
 /* Driver specific headers */
 #include "ast.h"
 
-#ifdef	Accel_2D
-
 /* Prototype type declaration */
 Bool bInitCMDQInfo(ScrnInfoPtr pScrn, ASTRecPtr pAST);
 Bool bEnableCMDQ(ScrnInfoPtr pScrn, ASTRecPtr pAST);
diff --git a/src/ast_accel.c b/src/ast_accel.c
index 689235e..7ae915c 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -20,43 +20,22 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef	Accel_2D
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include "xf86.h"
-#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
-#include "xf86cmap.h"
-#include "compiler.h"
-#include "mibstore.h"
-#include "vgaHW.h"
-#include "mipointer.h"
-#include "micmap.h"
-
-#include "fb.h"
-#include "regionstr.h"
-#include "xf86xv.h"
-#include <X11/extensions/Xv.h>
-#include "vbe.h"
-
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-
-/* framebuffer offscreen manager */
-#include "xf86fbman.h"
-
-/* include xaa includes */
-#include "xaa.h"
+#include "xf86str.h"
 #include "xaarop.h"
-
-/* H/W cursor support */
-#include "xf86Cursor.h"
-
-/* Driver specific headers */
 #include "ast.h"
+//
+///* H/W cursor support */
+//#include "xf86Cursor.h"
+//
+///* Driver specific headers */
+//#include "ast.h"
 
-#ifdef	Accel_2D
 /* ROP Translation Table */
 int ASTXAACopyROP[16] =
 {
diff --git a/src/ast_cursor.c b/src/ast_cursor.c
index 9d30e5c..47ed451 100644
--- a/src/ast_cursor.c
+++ b/src/ast_cursor.c
@@ -20,44 +20,19 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef	HWC
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
-#include "xf86cmap.h"
-#include "compiler.h"
-#include "mibstore.h"
-#include "vgaHW.h"
-#include "mipointer.h"
-#include "micmap.h"
-
-#include "fb.h"
-#include "regionstr.h"
-#include "xf86xv.h"
-#include <X11/extensions/Xv.h>
-#include "vbe.h"
-
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-
-/* framebuffer offscreen manager */
-#include "xf86fbman.h"
-
-/* include xaa includes */
-#include "xaa.h"
-#include "xaarop.h"
-
-/* H/W cursor support */
-#include "xf86Cursor.h"
-#include "cursorstr.h"
 
-/* Driver specific headers */
+#include "xf86.h"
+#include "xf86str.h"
+#include "screenint.h"
 #include "ast.h"
+#include "cursor.h"
+#include "cursorstr.h"
 
-#ifdef	HWC
 /* Prototype type declaration */
 Bool ASTCursorInit(ScreenPtr pScreen);
 Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST);
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 8967c9b..6f7a221 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -23,39 +23,15 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "xf86.h"
-#include "xf86_OSproc.h"
+#include "edid.h"
 #include "xf86Resources.h"
 #include "xf86RAC.h"
 #include "xf86cmap.h"
-#include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
-#include "mipointer.h"
-#include "micmap.h"
-
-#include "fb.h"
-#include "regionstr.h"
-#include "xf86xv.h"
-#include <X11/extensions/Xv.h>
 #include "vbe.h"
 
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-
-/* framebuffer offscreen manager */
-#include "xf86fbman.h"
-
-/* include xaa includes */
-#include "xaa.h"
-#include "xaarop.h"
-
-/* H/W cursor support */
-#include "xf86Cursor.h"
-
 /* Driver specific headers */
 #include "ast.h"
-
 /* external reference fucntion */
 extern Bool ASTMapMem(ScrnInfoPtr pScrn);
 extern Bool ASTUnmapMem(ScrnInfoPtr pScrn);
