diff --git a/configure.ac b/configure.ac
index 82d3e55f..b1d3524f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-i810],
-        1.6.0,
+        1.6.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-i810)
 
diff --git a/src/i810.h b/src/i810.h
index 044eb60f..740f38c8 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -66,7 +66,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define I810_DRIVER_NAME "i810"
 #define I810_MAJOR_VERSION 1
 #define I810_MINOR_VERSION 6
-#define I810_PATCHLEVEL 0
+#define I810_PATCHLEVEL 1
 
 
 /* HWMC Surfaces */
diff --git a/src/i830_3d.c b/src/i830_3d.c
index 0efd6e43..debad7c9 100644
--- a/src/i830_3d.c
+++ b/src/i830_3d.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include "xf86.h"
 #include "i830.h"
 
 #include "i830_reg.h"
diff --git a/src/i830_dri.h b/src/i830_dri.h
index 4f356d1f..31232b80 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -10,7 +10,7 @@
 
 #define I830_MAJOR_VERSION 1
 #define I830_MINOR_VERSION 6
-#define I830_PATCHLEVEL 0
+#define I830_PATCHLEVEL 1
 
 #define I830_REG_SIZE 0x80000
 
diff --git a/src/i915_3d.c b/src/i915_3d.c
index d8edb181..b1f30ef2 100644
--- a/src/i915_3d.c
+++ b/src/i915_3d.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include "xf86.h"
 #include "i830.h"
 
 #include "i915_reg.h"