diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index c668c3b56..84c3e32c3 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -85,7 +85,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 2)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(0, 7)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(0, 8)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(0, 5)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(0, 2)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 4)
diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c
index b2b62df35..c7fa4425b 100644
--- a/hw/xfree86/loader/misym.c
+++ b/hw/xfree86/loader/misym.c
@@ -77,7 +77,7 @@
 #include "mipict.h"
 #endif
 #ifdef COMPOSITE
-#include "cw/cw.h"
+#include "cw.h"
 #endif
 
 /* mi things */