diff --git a/configure.ac b/configure.ac
index d517c3a..8c81de9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86DGAProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG
diff --git a/xf86dga.h b/xf86dga.h
index 6d39268..7b5d635 100644
--- a/xf86dga.h
+++ b/xf86dga.h
@@ -1,3 +1,13 @@
+#ifdef _XF86DGA_SERVER_
+
 #warning "xf86dga.h is obsolete and may be removed in the future."
 #warning "include <X11/extensions/xf86dgaconst.h> instead."
 #include <X11/extensions/xf86dgaconst.h>
+
+#else
+
+#warning "xf86dga.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/Xxf86dga.h> instead."
+#include <X11/extensions/Xxf86dga.h>
+
+#endif