diff --git a/src/intel_options.c b/src/intel_options.c
index 6d53a3f3..02a4ae18 100644
--- a/src/intel_options.c
+++ b/src/intel_options.c
@@ -13,15 +13,15 @@ const OptionInfoRec intel_options[] = {
 	{OPTION_VIDEO_KEY,	"VideoKey",	OPTV_INTEGER,	{0},	0},
 	{OPTION_TILING_2D,	"Tiling",	OPTV_BOOLEAN,	{0},	1},
 	{OPTION_TILING_FB,	"LinearFramebuffer",	OPTV_BOOLEAN,	{0},	0},
-	{OPTION_VSYNC, "VSync", OPTV_BOOLEAN,	{0},	1},
-	{OPTION_PAGEFLIP, "PageFlip", OPTV_BOOLEAN,	{0},	1},
+	{OPTION_VSYNC,		"VSync",	OPTV_BOOLEAN,	{0},	1},
+	{OPTION_PAGEFLIP,	"PageFlip",	OPTV_BOOLEAN,	{0},	1},
 	{OPTION_SWAPBUFFERS_WAIT, "SwapbuffersWait", OPTV_BOOLEAN,	{0},	1},
 	{OPTION_TRIPLE_BUFFER,	"TripleBuffer", OPTV_BOOLEAN,	{0},	1},
 	{OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, 0},
 	{OPTION_HOTPLUG,	"HotPlug",	OPTV_BOOLEAN,	{0},	1},
 	{OPTION_REPROBE,	"ReprobeOutputs", OPTV_BOOLEAN,	{0},	0},
 #ifdef INTEL_XVMC
-	{OPTION_XVMC,	"XvMC",		OPTV_BOOLEAN,	{0},	1},
+	{OPTION_XVMC,		"XvMC",		OPTV_BOOLEAN,	{0},	1},
 #endif
 #ifdef USE_SNA
 	{OPTION_ZAPHOD,		"ZaphodHeads",	OPTV_STRING,	{0},	0},
diff --git a/src/intel_options.h b/src/intel_options.h
index e61075b3..77f0c45f 100644
--- a/src/intel_options.h
+++ b/src/intel_options.h
@@ -1,6 +1,7 @@
 #ifndef INTEL_OPTIONS_H
 #define INTEL_OPTIONS_H
 
+#include <xorg-server.h>
 #include <xf86.h>
 #include <xf86Opt.h>
 
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index bfb95a07..8c9d7fc1 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -60,7 +60,6 @@
 #endif
 #include <xf86drm.h>
 #include <xf86DDC.h> /* for xf86InterpretEDID */
-#include <xf86Opt.h> /* for xf86OptionPtr */
 
 #include "intel_options.h"
 
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index dcfcd673..4c956d81 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -59,7 +59,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <micmap.h>
 #include <mipict.h>
 
-
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include "i915_drm.h"