diff --git a/VisualCE.zip b/VisualCE.zip
index 01d298a28..0f712545d 100644
Binary files a/VisualCE.zip and b/VisualCE.zip differ
diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
index 8394fb119..e7f35139a 100644
--- a/include/SDL_syswm.h
+++ b/include/SDL_syswm.h
@@ -115,7 +115,7 @@ typedef struct SDL_SysWMinfo {
 	GR_WINDOW_ID window ;	/* The display window */
 } SDL_SysWMinfo;
 
-#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW)
+#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
index 48a982bc9..5f7af429c 100644
--- a/src/events/SDL_keyboard.c
+++ b/src/events/SDL_keyboard.c
@@ -59,7 +59,7 @@ int SDL_KeyboardInit(void)
 
 	/* Initialize the tables */
 	SDL_ModState = KMOD_NONE;
-	SDL_memset(keynames, 0, sizeof(keynames));
+	SDL_memset((void*)keynames, 0, sizeof(keynames));
 	SDL_memset(SDL_KeyState, 0, sizeof(SDL_KeyState));
 	video->InitOSKeymap(this);
 
diff --git a/test/testwin.c b/test/testwin.c
index 485963361..261ea9942 100644
--- a/test/testwin.c
+++ b/test/testwin.c
@@ -250,9 +250,9 @@ int main(int argc, char *argv[])
 	delay = 1;
 
 #ifdef _WIN32_WCE
-	w = 640;
+	w = 240;
 	h = 320;
-	desired_bpp = 0;
+	desired_bpp = 8;
 	video_flags = SDL_FULLSCREEN;
 #else
 	w = 640;