diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index 9ba5e44b8..493ae7665 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -406,7 +406,7 @@ SDL_LogEvent(const SDL_Event *event)
             SDL_snprintf(details, sizeof (details), " (timestamp=%u touchid=%"SDL_PRIs64" gestureid=%"SDL_PRIs64" numfingers=%u error=%f x=%f y=%f)", \
                 (uint) event->dgesture.timestamp, (long long)event->dgesture.touchId, \
                 (long long)event->dgesture.gestureId, (uint) event->dgesture.numFingers, \
-                event->dgesture.error, event->dgesture.x, event->dgesture.y);
+                event->dgesture.error, event->dgesture.x, event->dgesture.y)
         SDL_EVENT_CASE(SDL_DOLLARGESTURE) PRINT_DOLLAR_EVENT(event); break;
         SDL_EVENT_CASE(SDL_DOLLARRECORD) PRINT_DOLLAR_EVENT(event); break;
         #undef PRINT_DOLLAR_EVENT
@@ -425,7 +425,7 @@ SDL_LogEvent(const SDL_Event *event)
         SDL_EVENT_CASE(SDL_DROPCOMPLETE) PRINT_DROP_EVENT(event); break;
         #undef PRINT_DROP_EVENT
 
-        #define PRINT_AUDIODEV_EVENT(event) SDL_snprintf(details, sizeof (details), " (timestamp=%u which=%u iscapture=%s)", (uint) event->adevice.timestamp, (uint) event->adevice.which, event->adevice.iscapture ? "true" : "false");
+        #define PRINT_AUDIODEV_EVENT(event) SDL_snprintf(details, sizeof (details), " (timestamp=%u which=%u iscapture=%s)", (uint) event->adevice.timestamp, (uint) event->adevice.which, event->adevice.iscapture ? "true" : "false")
         SDL_EVENT_CASE(SDL_AUDIODEVICEADDED) PRINT_AUDIODEV_EVENT(event); break;
         SDL_EVENT_CASE(SDL_AUDIODEVICEREMOVED) PRINT_AUDIODEV_EVENT(event); break;
         #undef PRINT_AUDIODEV_EVENT
diff --git a/src/hidapi/libusb/hid.c b/src/hidapi/libusb/hid.c
index 1f08aedfa..9e2a43589 100644
--- a/src/hidapi/libusb/hid.c
+++ b/src/hidapi/libusb/hid.c
@@ -322,7 +322,7 @@ static int get_usage(uint8_t *report_descriptor, size_t size,
 				/* Can't ever happen since size_code is & 0x3 */
 				data_len = 0;
 				break;
-			};
+			}
 			key_size = 1;
 		}
 
diff --git a/src/hidapi/linux/hid.c b/src/hidapi/linux/hid.c
index fbd010144..cf857a675 100644
--- a/src/hidapi/linux/hid.c
+++ b/src/hidapi/linux/hid.c
@@ -200,7 +200,7 @@ static int uses_numbered_reports(__u8 *report_descriptor, __u32 size) {
 				/* Can't ever happen since size_code is & 0x3 */
 				data_len = 0;
 				break;
-			};
+			}
 			key_size = 1;
 		}
 
diff --git a/src/main/ps2/SDL_ps2_main.c b/src/main/ps2/SDL_ps2_main.c
index 6d5c43a03..e9a4b513d 100644
--- a/src/main/ps2/SDL_ps2_main.c
+++ b/src/main/ps2/SDL_ps2_main.c
@@ -28,8 +28,10 @@
 __attribute__((weak))
 void reset_IOP() {
     SifInitRpc(0);
-    while(!SifIopReset(NULL, 0)){};
-    while(!SifIopSync()){};
+    while(!SifIopReset(NULL, 0)) {
+    }
+    while(!SifIopSync()){
+    }
 }
 
 static void prepare_IOP()
diff --git a/src/render/software/SDL_triangle.c b/src/render/software/SDL_triangle.c
index 694cb4d91..f70c07933 100644
--- a/src/render/software/SDL_triangle.c
+++ b/src/render/software/SDL_triangle.c
@@ -533,7 +533,7 @@ int SDL_SW_BlitTriangle(
 
     if (is_uniform) {
         // SDL_GetSurfaceColorMod(src, &r, &g, &b);
-        has_modulation = c0.r != 255 || c0.g != 255 || c0.b != 255 || c0.a != 255;;
+        has_modulation = c0.r != 255 || c0.g != 255 || c0.b != 255 || c0.a != 255;
     } else {
         has_modulation = SDL_TRUE;
     }
@@ -759,7 +759,7 @@ SDL_BlitTriangle_Slow(SDL_BlitInfo *info,
     Uint32 ckey = info->colorkey & rgbmask;
 
     Uint8 *dst_ptr = info->dst;
-    int dst_pitch = info->dst_pitch;;
+    int dst_pitch = info->dst_pitch;
 
     srcfmt_val = detect_format(src_fmt);
     dstfmt_val = detect_format(dst_fmt);
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 18b7bfc58..0804c9cfb 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -3754,7 +3754,7 @@ SDL_GL_SetAttribute(SDL_GLattr attr, int value)
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
         } else {
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, 0);
-        };
+        }
         break;
     case SDL_GL_CONTEXT_FLAGS:
         if (value & ~(SDL_GL_CONTEXT_DEBUG_FLAG |
diff --git a/src/video/windows/SDL_windowskeyboard.c b/src/video/windows/SDL_windowskeyboard.c
index 83a939d64..a62ba0717 100644
--- a/src/video/windows/SDL_windowskeyboard.c
+++ b/src/video/windows/SDL_windowskeyboard.c
@@ -1634,7 +1634,6 @@ IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc)
             (candcount * candborder * 2) +
             (candcount * candpadding * 2) +
             ((candcount - 1) * horzcandspacing);
-        ;
 
         for (i = 0; i < candcount; ++i)
             size.cx += candsizes[i].cx;
diff --git a/src/video/x11/edid-parse.c b/src/video/x11/edid-parse.c
index c717f1b1f..52c5d5f80 100644
--- a/src/video/x11/edid-parse.c
+++ b/src/video/x11/edid-parse.c
@@ -623,7 +623,7 @@ dump_monitor_info (MonitorInfo *info)
 	case RGB: s = "rgb"; break;
 	case OTHER_COLOR: s = "other color"; break;
 	default: s = "unknown"; break;
-	};
+	}
 	
 	printf ("Color: %s\n", s);
     }
diff --git a/test/testrelative.c b/test/testrelative.c
index 59a563eea..40c670bc9 100644
--- a/test/testrelative.c
+++ b/test/testrelative.c
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
     srand((unsigned int)time(NULL));
     if(SDL_SetRelativeMouseMode(SDL_TRUE) < 0) {
         return 3;
-    };
+    }
 
     rect.x = DEFAULT_WINDOW_WIDTH / 2;
     rect.y = DEFAULT_WINDOW_HEIGHT / 2;
diff --git a/visualtest/src/windows/windows_screenshot.c b/visualtest/src/windows/windows_screenshot.c
index 6d9189dc4..d4ac7d3a1 100644
--- a/visualtest/src/windows/windows_screenshot.c
+++ b/visualtest/src/windows/windows_screenshot.c
@@ -261,7 +261,7 @@ screenshotwindow_cleanup_windowdc:
     if(!ReleaseDC(hwnd, windowdc))
     {
         SDLTest_LogError("ReleaseDC() failed");
-        return_code = 0;;
+        return_code = 0;
     }
 
 screenshotwindow_cleanup_generic: