diff --git a/VisualC.zip b/VisualC.zip
index 3325dae71..1d00902ba 100644
Binary files a/VisualC.zip and b/VisualC.zip differ
diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c
index 1f66f75fa..47241a4c2 100644
--- a/src/file/SDL_rwops.c
+++ b/src/file/SDL_rwops.c
@@ -191,7 +191,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
         void *data = (char *) context->hidden.win32io.buffer.data +
             context->hidden.win32io.buffer.size -
             context->hidden.win32io.buffer.left;
-        read_ahead = SDL_min(total_need, context->hidden.win32io.buffer.left);
+        read_ahead = SDL_min(total_need, (size_t)context->hidden.win32io.buffer.left);
         SDL_memcpy(ptr, data, read_ahead);
         context->hidden.win32io.buffer.left -= read_ahead;
 
diff --git a/test/common.c b/test/common.c
index 361020499..e7fdb69d6 100644
--- a/test/common.c
+++ b/test/common.c
@@ -245,7 +245,7 @@ CommonArg(CommonState * state, int index)
         if (!argv[index]) {
             return -1;
         }
-        state->audiospec.channels = SDL_atoi(argv[index]);
+        state->audiospec.channels = (Uint8)SDL_atoi(argv[index]);
         return 2;
     }
     if (SDL_strcasecmp(argv[index], "--samples") == 0) {
@@ -253,7 +253,7 @@ CommonArg(CommonState * state, int index)
         if (!argv[index]) {
             return -1;
         }
-        state->audiospec.samples = SDL_atoi(argv[index]);
+        state->audiospec.samples = (Uint16)SDL_atoi(argv[index]);
         return 2;
     }
     if ((SDL_strcasecmp(argv[index], "-h") == 0)
@@ -498,7 +498,7 @@ PrintRenderer(SDL_RendererInfo * info)
     fprintf(stderr, ")\n");
 
     fprintf(stderr, "    Texture formats (%d): ", info->num_texture_formats);
-    for (i = 0; i < info->num_texture_formats; ++i) {
+    for (i = 0; i < (int)info->num_texture_formats; ++i) {
         if (i > 0) {
             fprintf(stderr, ", ");
         }
diff --git a/test/loopwave.c b/test/loopwave.c
index d60b08508..460662425 100644
--- a/test/loopwave.c
+++ b/test/loopwave.c
@@ -67,8 +67,6 @@ poked(int sig)
 int
 main(int argc, char *argv[])
 {
-    int i, n;
-
     /* Load the SDL library */
     if (SDL_Init(SDL_INIT_AUDIO) < 0) {
         fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
diff --git a/test/testwm.c b/test/testwm.c
index f75460131..646239f1d 100644
--- a/test/testwm.c
+++ b/test/testwm.c
@@ -175,7 +175,7 @@ HotKey_Quit(void)
     SDL_PushEvent(&event);
 }
 
-static int SDLCALL(*old_filterfunc) (void *, SDL_Event *);
+static int (SDLCALL *old_filterfunc) (void *, SDL_Event *);
 static void *old_filterdata;
 
 int SDLCALL