diff --git a/src/intel_display.c b/src/intel_display.c
index bf160492..2a3a393c 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -385,7 +385,6 @@ intel_crtc_apply(xf86CrtcPtr crtc)
 	ScrnInfoPtr scrn = crtc->scrn;
 	struct intel_crtc *intel_crtc = crtc->driver_private;
 	struct intel_mode *mode = intel_crtc->mode;
-	intel_screen_private *intel = intel_get_screen_private(scrn);
 	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
 	uint32_t *output_ids;
 	int output_count = 0;
diff --git a/src/intel_module.c b/src/intel_module.c
index 7de9da7e..e6ca964d 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -537,6 +537,8 @@ static Bool intel_pci_probe(DriverPtr		driver,
 #if USE_UXA
 	case UXA: return intel_init_scrn(scrn);
 #endif
+
+	default: break;
 	}
 #endif
 
@@ -592,6 +594,8 @@ intel_platform_probe(DriverPtr driver,
 #if USE_UXA
         case UXA: return intel_init_scrn(scrn);
 #endif
+
+	default: break;
 	}
 #endif