diff --git a/src/audio/audio.c b/src/audio/audio.c
index cc91211127..6e2e2b7ad6 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -44,7 +44,6 @@ void *gCrowdSoundChannel = 0;
 bool gGameSoundsOff = false;
 void *gRainSoundChannel = 0;
 rct_ride_music gRideMusicList[AUDIO_MAX_RIDE_MUSIC];
-rct_ride_music_info *gRideMusicInfoList[NUM_DEFAULT_MUSIC_TRACKS];
 rct_ride_music_params gRideMusicParamsList[AUDIO_MAX_RIDE_MUSIC];
 rct_ride_music_params *gRideMusicParamsListEnd;
 void *gTitleMusicChannel = 0;
diff --git a/src/cmdline.c b/src/cmdline.c
index 8b1480b842..d0164f7cc9 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -45,6 +45,7 @@ typedef struct argparse argparse_t;
 typedef int (*cmdline_action)(const char **argv, int argc);
 
 int gExitCode = 0;
+int sprite_mode;
 
 #ifndef DISABLE_NETWORK
 int gNetworkStart = NETWORK_MODE_NONE;
diff --git a/src/cmdline.h b/src/cmdline.h
index 91e2e33bc4..e5ff81e243 100644
--- a/src/cmdline.h
+++ b/src/cmdline.h
@@ -26,7 +26,7 @@
 /** The exit code for OpenRCT2 when it exits. */
 extern int gExitCode;
 
-int sprite_mode;
+extern int sprite_mode;
 
 extern int gNetworkStart;
 extern char gNetworkStartHost[128];
diff --git a/src/interface/window.h b/src/interface/window.h
index 28862b35c9..d2609a4ac1 100644
--- a/src/interface/window.h
+++ b/src/interface/window.h
@@ -458,7 +458,7 @@ enum {
 	WC_STAFF = 220,
 	WC_EDITOR_TRACK_BOTTOM_TOOLBAR = 221,
 	WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR = 222,
-} WINDOW_CLASS;
+};
 
 enum PROMPT_MODE {
 	PM_SAVE_BEFORE_LOAD = 0,
diff --git a/src/rct1.h b/src/rct1.h
index 4e1df84dac..53b2ad6caa 100644
--- a/src/rct1.h
+++ b/src/rct1.h
@@ -502,7 +502,7 @@ enum {
 
 extern const uint8 RCT1ColourConversionTable[32];
 
-const uint8 gRideCategories[0x60];
+extern const uint8 gRideCategories[0x60];
 
 bool rct1_read_sc4(const char *path, rct1_s4 *s4);
 bool rct1_read_sv4(const char *path, rct1_s4 *s4);
diff --git a/src/title.h b/src/title.h
index 890a6bdf60..924bb738eb 100644
--- a/src/title.h
+++ b/src/title.h
@@ -35,7 +35,7 @@ enum {
 	TITLE_SCRIPT_SPEED,
 	TITLE_SCRIPT_LOOP,
 	TITLE_SCRIPT_ENDLOOP
-} TITLE_SCRIPT_COMMANDS;
+};
 
 extern sint32 gTitleScriptCommand;
 extern uint8 gTitleScriptSave;
diff --git a/src/windows/network_status.c b/src/windows/network_status.c
index 1aadcf2d51..a7091a7f6a 100644
--- a/src/windows/network_status.c
+++ b/src/windows/network_status.c
@@ -25,7 +25,7 @@
 #include "../util/util.h"
 #include "../network/network.h"
 
-char _password[33];
+static char _password[33];
 
 enum WINDOW_NETWORK_STATUS_WIDGET_IDX {
 	WIDX_BACKGROUND,
diff --git a/src/windows/server_start.c b/src/windows/server_start.c
index a63aaacd60..a158d3a84e 100644
--- a/src/windows/server_start.c
+++ b/src/windows/server_start.c
@@ -28,9 +28,9 @@
 #include "../util/util.h"
 #include "error.h"
 
-char _port[7];
-char _name[65];
-char _password[33];
+static char _port[7];
+static char _name[65];
+static char _password[33];
 
 enum {
 	WIDX_BACKGROUND,
diff --git a/src/world/banner.h b/src/world/banner.h
index 7b836d0815..e53cf053e6 100644
--- a/src/world/banner.h
+++ b/src/world/banner.h
@@ -41,7 +41,7 @@ enum{
 	BANNER_FLAG_NO_ENTRY = (1 << 0),
 	BANNER_FLAG_1 = (1 << 1),
 	BANNER_FLAG_2 = (1 << 2)
-} BANNER_FLAGS;
+};
 
 extern rct_banner *gBanners;
 
diff --git a/src/world/climate.c b/src/world/climate.c
index 41f3801f52..e81b418912 100644
--- a/src/world/climate.c
+++ b/src/world/climate.c
@@ -85,7 +85,7 @@ int climate_celsius_to_fahrenheit(int celsius)
 }
 
 // cheats
-extern int g_climate_locked;
+int g_climate_locked;
 extern void toggle_climate_lock();
 
 /**
diff --git a/src/world/climate.h b/src/world/climate.h
index 147b6445ac..1e600692ae 100644
--- a/src/world/climate.h
+++ b/src/world/climate.h
@@ -54,7 +54,7 @@ typedef struct {
 extern const rct_weather climate_weather_data[6];
 
 // cheats
-int g_climate_locked;
+extern int g_climate_locked;
 void toggle_climate_lock();
 
 int climate_celsius_to_fahrenheit(int celsius);