diff --git a/src/video/dga/SDL_dgavideo.h b/src/video/dga/SDL_dgavideo.h
index a2ef724c0..36d5af295 100644
--- a/src/video/dga/SDL_dgavideo.h
+++ b/src/video/dga/SDL_dgavideo.h
@@ -25,6 +25,7 @@
 #define _SDL_dgavideo_h
 
 #include <X11/Xlib.h>
+#include <X11/Xproto.h>
 
 #include "SDL_mouse.h"
 #include "SDL_mutex.h"
@@ -93,9 +94,7 @@ struct SDL_PrivateVideoData {
 
 	/* Screensaver settings */
 	int screensaver_timeout;
-#if SDL_VIDEO_DRIVER_X11_DPMS
 	BOOL dpms_enabled;
-#endif
 };
 /* Old variable names */
 #define DGA_Display		(this->hidden->DGA_Display)
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index 4f138b365..47d6b2ceb 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -1131,6 +1131,8 @@ void X11_SaveScreenSaver(Display *display, int *saved_timeout, BOOL *dpms)
 			DPMSInfo(display, &state, dpms);
 		}
 	}
+#else
+	*dpms = 0;
 #endif /* SDL_VIDEO_DRIVER_X11_DPMS */
 }