diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index f5cd49060..703f9d269 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -198,8 +198,7 @@ SDL_VideoInit(const char *driver_name, Uint32 flags)
     }
     if (driver_name != NULL) {
         for (i = 0; bootstrap[i]; ++i) {
-            if (SDL_strncmp(bootstrap[i]->name, driver_name,
-                            SDL_strlen(bootstrap[i]->name)) == 0) {
+            if (SDL_strcasecmp(bootstrap[i]->name, driver_name) == 0) {
                 if (bootstrap[i]->available()) {
                     video = bootstrap[i]->create(index);
                 }
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index 8561b1755..75b564db8 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -21,6 +21,10 @@
 */
 #include "SDL_config.h"
 
+#include <sys/types.h>
+#include <sys/time.h>
+#include <unistd.h>
+
 #include "SDL_syswm.h"
 #include "SDL_x11video.h"
 #include "../../events/SDL_events_c.h"