--- os/utils.orig	Tue Sep 18 22:00:50 2007
+++ os/utils.c	Tue Sep 18 22:01:35 2007
@@ -790,13 +790,13 @@ ProcessCommandLine(int argc, char *argv[
 	}
 	else if ( strcmp( argv[i], "-core") == 0)
 	{
-	    CoreDump = TRUE;
 #if !defined(WIN32) || !defined(__MINGW32__)
 	    struct rlimit   core_limit;
 	    getrlimit (RLIMIT_CORE, &core_limit);
 	    core_limit.rlim_cur = core_limit.rlim_max;
 	    setrlimit (RLIMIT_CORE, &core_limit);
 #endif
+	    CoreDump = TRUE;
 	}
 	else if ( strcmp( argv[i], "-dpi") == 0)
 	{
--- hw/xfree86/common/xf86Config.orig	Tue Sep 18 22:18:10 2007
+++ hw/xfree86/common/xf86Config.c	Tue Sep 18 22:19:16 2007
@@ -600,8 +600,9 @@ configFiles(XF86ConfFilesPtr fileconf)
       pathFrom = X_CONFIG;
       if (*f) {
         if (xf86Info.useDefaultFontPath) {
+          char *g;
           xf86Msg(X_DEFAULT, "Including the default font path %s.\n", defaultFontPath);
-          char *g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3);
+          g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3);
           strcpy(g, f);
           strcat(g, ",");
           defaultFontPath = strcat(g, defaultFontPath);
@@ -1216,8 +1217,8 @@ checkCoreInputDevices(serverLayoutPtr se
      * remove the core attribute from the later ones.
      */
     for (devs = servlayoutp->inputs; devs && *devs; devs++) {
-        indp = *devs;
 	pointer opt1 = NULL, opt2 = NULL;
+        indp = *devs;
 	if (indp->commonOptions &&
 	    xf86CheckBoolOption(indp->commonOptions, "CorePointer", FALSE)) {
 	    opt1 = indp->commonOptions;
--- hw/xfree86/modes/xf86Rotate.orig	Tue Sep 18 22:27:50 2007
+++ hw/xfree86/modes/xf86Rotate.c	Tue Sep 18 22:29:25 2007
@@ -579,6 +579,10 @@ xf86CrtcRotate (xf86CrtcPtr crtc, Displa
     }
     else
     {
+	int width, height, old_width, old_height;
+	PixmapPtr shadow;
+	void *shadowData;
+
 	PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, crtc->x, crtc->y);
 	PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc);
 	
@@ -587,12 +591,12 @@ xf86CrtcRotate (xf86CrtcPtr crtc, Displa
 	 * matches the mode, not the pre-rotated copy in the
 	 * frame buffer
 	 */
-	int	    width = mode->HDisplay;
-	int	    height = mode->VDisplay;
-	void	    *shadowData = crtc->rotatedData;
-	PixmapPtr   shadow = crtc->rotatedPixmap;
-	int	    old_width = shadow ? shadow->drawable.width : 0;
-	int	    old_height = shadow ? shadow->drawable.height : 0;
+	width = mode->HDisplay;
+	height = mode->VDisplay;
+	shadowData = crtc->rotatedData;
+	shadow = crtc->rotatedPixmap;
+	old_width = shadow ? shadow->drawable.width : 0;
+	old_height = shadow ? shadow->drawable.height : 0;
 	
 	/* Allocate memory for rotation */
 	if (old_width != width || old_height != height)
--- hw/xnest/Args.orig	Tue Sep 18 22:30:30 2007
+++ hw/xnest/Args.c	Tue Sep 18 22:31:52 2007
@@ -55,11 +55,15 @@ void ddxInitGlobals(void)
 #ifdef COMPOSITE
     /* XXX terrible hack */
     extern Bool noCompositeExtension;
-    noCompositeExtension = TRUE;
 #endif
-
 #ifdef XKB
     extern Bool noXkbExtension;
+#endif
+
+#ifdef COMPOSITE
+    noCompositeExtension = TRUE;
+#endif
+#ifdef XKB
     noXkbExtension = TRUE;
 #endif
 }