diff --git a/Makefile b/Makefile
index 7c3ecca2f45..fd5ab72b4bd 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ include config.mak
 # Uncomment this for stricter compile time code verification
 # CXXFLAGS+= -Wshadow -Werror
 
-CXXFLAGS:= -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
+CXXFLAGS:= -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
 # Even more warnings...
 CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
 CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
diff --git a/common/file.cpp b/common/file.cpp
index e99ef2b8cf5..78667f0c9ad 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -25,9 +25,10 @@
 
 FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) {
 	FILE *file;
-	char buf[256];
+	char buf[512];
 	char *ptr;
 
+	assert(directory);
 	strcpy(buf, directory);
 
 #ifdef WIN32
diff --git a/common/list.h b/common/list.h
index 213b77ccb93..4421981628e 100644
--- a/common/list.h
+++ b/common/list.h
@@ -126,6 +126,6 @@ protected:
 	}
 };
 
-};// End of namespace ScummVM
+} // End of namespace ScummVM
 
 #endif
diff --git a/common/map.h b/common/map.h
index 8098afa1bd3..e4b3099573d 100644
--- a/common/map.h
+++ b/common/map.h
@@ -237,6 +237,6 @@ class String;
 
 typedef Map<String, String> StringMap;
 
-};	// End of namespace ScummVM
+}	// End of namespace ScummVM
 
 #endif
diff --git a/common/rect.h b/common/rect.h
index c5a62cab224..a4820a37226 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -108,6 +108,6 @@ struct Rect {
 	}
 };
 
-};	// End of namespace ScummVM
+}	// End of namespace ScummVM
 
 #endif
diff --git a/common/str.cpp b/common/str.cpp
index 526841c58f7..99b17663528 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -266,4 +266,4 @@ bool operator != (const char* y, const ConstString &x) {
 	return x != y;
 }
 
-};	// End of namespace ScummVM
+}	// End of namespace ScummVM
diff --git a/common/str.h b/common/str.h
index 955f5ab7f1b..e134557dc78 100644
--- a/common/str.h
+++ b/common/str.h
@@ -141,6 +141,6 @@ public:
 	}
 };
 
-};	// End of namespace ScummVM
+}	// End of namespace ScummVM
 
 #endif
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index b298797be44..a7965352813 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -2158,10 +2158,12 @@ void Gdi::unkDecode11(byte *dst, const byte *src, int height) {
 #pragma mark -
 
 void Scumm::fadeIn(int effect) {
-
 	updatePalette();
 
 	switch (effect) {
+	case 0:
+		// seems to do nothing
+		break;
 	case 1:
 	case 2:
 	case 3:
@@ -2179,6 +2181,8 @@ void Scumm::fadeIn(int effect) {
 	case 128:
 		unkScreenEffect6();
 		break;
+	case 129:
+		break;
 	case 130:
 	case 131:
 	case 132:
@@ -2191,8 +2195,6 @@ void Scumm::fadeIn(int effect) {
 	case 135:
 		unkScreenEffect5(1);
 		break;
-	case 129:
-		break;
 	default:
 		warning("Unknown screen effect, %d", effect);
 	}
diff --git a/sky/compact.cpp b/sky/compact.cpp
index 22e27ce7304..ae244f65e9c 100644
--- a/sky/compact.cpp
+++ b/sky/compact.cpp
@@ -51,7 +51,7 @@ namespace SkyTalkAnims {
 	extern bool animTalkTableIsPointer[];
 	extern uint16 animTalkTableVal[];
 	extern void *animTalkTablePtr[];
-};
+}
 
 namespace SkyCompact {
 
@@ -602,5 +602,5 @@ void patchFor288(void) {
 	((Compact *)SkyCompact::data_3[409])->actionScript = 0x3127; // slot_28
 }
 
-};
+}
 
diff --git a/sky/compact.h b/sky/compact.h
index aabad83fef7..451140d2c36 100644
--- a/sky/compact.h
+++ b/sky/compact.h
@@ -3252,6 +3252,6 @@ namespace SkyCompact {
 	extern uint16 ss_auto[];
 	extern uint16 wit_auto[];
 	extern uint16 minif_auto[];
-};
+}
 
 #endif
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h
index c193b7a6038..3f64104f73b 100644
--- a/sky/compacts/0compact.h
+++ b/sky/compacts/0compact.h
@@ -9322,6 +9322,6 @@ void *data_1[] = {
 	car_down_seq
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/101comp.h b/sky/compacts/101comp.h
index aaf16d07904..10af25f9b3d 100644
--- a/sky/compacts/101comp.h
+++ b/sky/compacts/101comp.h
@@ -882,6 +882,6 @@ uint16 s101_chip_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/102comp.h b/sky/compacts/102comp.h
index 6d7b5873af7..8640106b80b 100644
--- a/sky/compacts/102comp.h
+++ b/sky/compacts/102comp.h
@@ -568,6 +568,6 @@ Compact restart_butt = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/10comp.h b/sky/compacts/10comp.h
index e5c8297172f..6f1028ae8b3 100644
--- a/sky/compacts/10comp.h
+++ b/sky/compacts/10comp.h
@@ -2430,6 +2430,6 @@ Compact liyt_1 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/11comp.h b/sky/compacts/11comp.h
index 165b4fa1a0a..c882a4484a7 100644
--- a/sky/compacts/11comp.h
+++ b/sky/compacts/11comp.h
@@ -1725,6 +1725,6 @@ uint16 cable_fall2_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/12comp.h b/sky/compacts/12comp.h
index 30005e78464..f5fa78f82fa 100644
--- a/sky/compacts/12comp.h
+++ b/sky/compacts/12comp.h
@@ -2227,6 +2227,6 @@ uint16 topbelt_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h
index c8291b5905d..9c6d80e541a 100644
--- a/sky/compacts/13comp.h
+++ b/sky/compacts/13comp.h
@@ -3765,6 +3765,6 @@ uint16 armsup_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h
index 0954bdce3b9..fc155ba6325 100644
--- a/sky/compacts/14comp.h
+++ b/sky/compacts/14comp.h
@@ -2073,6 +2073,6 @@ uint16 change6_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/15comp.h b/sky/compacts/15comp.h
index 4da2c3aa1be..a826e4f82bb 100644
--- a/sky/compacts/15comp.h
+++ b/sky/compacts/15comp.h
@@ -1106,6 +1106,6 @@ uint16 s15_chip_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/16comp.h b/sky/compacts/16comp.h
index b7c23a3f512..e599913e78d 100644
--- a/sky/compacts/16comp.h
+++ b/sky/compacts/16comp.h
@@ -980,6 +980,6 @@ uint16 fost_con_look[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/17comp.h b/sky/compacts/17comp.h
index 45fbc459cb2..99945baea8a 100644
--- a/sky/compacts/17comp.h
+++ b/sky/compacts/17comp.h
@@ -914,6 +914,6 @@ Compact pulse = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/18comp.h b/sky/compacts/18comp.h
index 64624635b2f..37c073bb58e 100644
--- a/sky/compacts/18comp.h
+++ b/sky/compacts/18comp.h
@@ -1601,6 +1601,6 @@ Compact right_exit_s18 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/19comp.h b/sky/compacts/19comp.h
index 3eaa69957f4..925b27b6467 100644
--- a/sky/compacts/19comp.h
+++ b/sky/compacts/19comp.h
@@ -721,6 +721,6 @@ uint16 s19_fast_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/1compact.h b/sky/compacts/1compact.h
index afc986b4f3c..8f44bb362ce 100644
--- a/sky/compacts/1compact.h
+++ b/sky/compacts/1compact.h
@@ -1972,6 +1972,6 @@ uint16 fire1_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/20comp.h b/sky/compacts/20comp.h
index 2220248f0b3..a672732b593 100644
--- a/sky/compacts/20comp.h
+++ b/sky/compacts/20comp.h
@@ -1221,6 +1221,6 @@ uint16 s20_mouse[] = {
 	ID_TEXT_MOUSE
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/21comp.h b/sky/compacts/21comp.h
index ac2e19af323..afe95beaf89 100644
--- a/sky/compacts/21comp.h
+++ b/sky/compacts/21comp.h
@@ -2142,6 +2142,6 @@ uint16 take_cassette_seq[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/22comp.h b/sky/compacts/22comp.h
index 03c34ea4ff6..5cc42780617 100644
--- a/sky/compacts/22comp.h
+++ b/sky/compacts/22comp.h
@@ -1581,6 +1581,6 @@ Compact fish_poster = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/23comp.h b/sky/compacts/23comp.h
index 0e259d75494..15bdc0d1c51 100644
--- a/sky/compacts/23comp.h
+++ b/sky/compacts/23comp.h
@@ -795,6 +795,6 @@ uint16 rs_foster_29_23[] = {
 	65535
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/24comp.h b/sky/compacts/24comp.h
index 6ad0a0795ad..b19041e4931 100644
--- a/sky/compacts/24comp.h
+++ b/sky/compacts/24comp.h
@@ -1311,6 +1311,6 @@ uint16 s24_fast_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/25comp.h b/sky/compacts/25comp.h
index 023cb36f5d4..8bd9e9536c4 100644
--- a/sky/compacts/25comp.h
+++ b/sky/compacts/25comp.h
@@ -1117,6 +1117,6 @@ Compact s25_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/26comp.h b/sky/compacts/26comp.h
index adb0d35f6ef..2e605d87994 100644
--- a/sky/compacts/26comp.h
+++ b/sky/compacts/26comp.h
@@ -1303,6 +1303,6 @@ Compact s26_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h
index b8b23ce2d7b..6e83bb42bd0 100644
--- a/sky/compacts/27comp.h
+++ b/sky/compacts/27comp.h
@@ -3274,6 +3274,6 @@ Compact chair_27 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/28comp.h b/sky/compacts/28comp.h
index 43be8f8a34a..ad606a4a977 100644
--- a/sky/compacts/28comp.h
+++ b/sky/compacts/28comp.h
@@ -989,6 +989,6 @@ Compact small_l_28 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/29comp.h b/sky/compacts/29comp.h
index 50858fe2724..a07f663efe2 100644
--- a/sky/compacts/29comp.h
+++ b/sky/compacts/29comp.h
@@ -1590,6 +1590,6 @@ void *data_3[] = {
 	rs_31_28
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h
index 7ea316c2a00..00e8d52eef7 100644
--- a/sky/compacts/2compact.h
+++ b/sky/compacts/2compact.h
@@ -1820,6 +1820,6 @@ Compact top_barrel = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/30comp.h b/sky/compacts/30comp.h
index 454c5fa443e..b24b01ffbad 100644
--- a/sky/compacts/30comp.h
+++ b/sky/compacts/30comp.h
@@ -6615,6 +6615,6 @@ void *data_4[] = {
 	&sc31_at_watcher
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/31comp.h b/sky/compacts/31comp.h
index 7f9b1ff5371..be6f9e5f492 100644
--- a/sky/compacts/31comp.h
+++ b/sky/compacts/31comp.h
@@ -2850,6 +2850,6 @@ uint16 sc31_joey_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/32comp.h b/sky/compacts/32comp.h
index b1f28f9bc24..c3f4bcd4db0 100644
--- a/sky/compacts/32comp.h
+++ b/sky/compacts/32comp.h
@@ -1836,6 +1836,6 @@ Compact sc32_exit_33 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/33comp.h b/sky/compacts/33comp.h
index 806c990a983..7446f1f344b 100644
--- a/sky/compacts/33comp.h
+++ b/sky/compacts/33comp.h
@@ -824,6 +824,6 @@ uint16 reset_30_33[] = {
 	65535
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/34comp.h b/sky/compacts/34comp.h
index 954db133c3f..dfa81a305cf 100644
--- a/sky/compacts/34comp.h
+++ b/sky/compacts/34comp.h
@@ -954,6 +954,6 @@ Compact sc34_door = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h
index 9285673d400..0bd3cbc9802 100644
--- a/sky/compacts/36comp.h
+++ b/sky/compacts/36comp.h
@@ -4269,6 +4269,6 @@ Compact sc36_exit_30 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/37comp.h b/sky/compacts/37comp.h
index b094889e30d..37b2361bc6d 100644
--- a/sky/compacts/37comp.h
+++ b/sky/compacts/37comp.h
@@ -1904,6 +1904,6 @@ uint16 sc37_crbarbox[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h
index b16b92ab992..27ba864c39d 100644
--- a/sky/compacts/38comp.h
+++ b/sky/compacts/38comp.h
@@ -3828,6 +3828,6 @@ uint16 sc38_lift_down[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/39comp.h b/sky/compacts/39comp.h
index 565df3bb8fa..cad8dad7c87 100644
--- a/sky/compacts/39comp.h
+++ b/sky/compacts/39comp.h
@@ -774,6 +774,6 @@ uint16 sc39_palette[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h
index 7b3086790d2..3b04bd2577b 100644
--- a/sky/compacts/3compact.h
+++ b/sky/compacts/3compact.h
@@ -1843,6 +1843,6 @@ Compact low_barrel = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/40comp.h b/sky/compacts/40comp.h
index c9983c71a0d..c59a4943676 100644
--- a/sky/compacts/40comp.h
+++ b/sky/compacts/40comp.h
@@ -1220,6 +1220,6 @@ uint16 sc40_ascend[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/41comp.h b/sky/compacts/41comp.h
index b71b87ffc66..f195d1cc806 100644
--- a/sky/compacts/41comp.h
+++ b/sky/compacts/41comp.h
@@ -744,6 +744,6 @@ uint16 sc41_palette[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/42comp.h b/sky/compacts/42comp.h
index c67e76d21f1..fbcd0a29781 100644
--- a/sky/compacts/42comp.h
+++ b/sky/compacts/42comp.h
@@ -1708,6 +1708,6 @@ uint16 sc42_fos_leave[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/44comp.h b/sky/compacts/44comp.h
index 486166f6e05..57a9817e8b7 100644
--- a/sky/compacts/44comp.h
+++ b/sky/compacts/44comp.h
@@ -649,6 +649,6 @@ uint16 reset_37_44[] = {
 	65535
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/45comp.h b/sky/compacts/45comp.h
index 6a1187a3fc1..757a3d092dc 100644
--- a/sky/compacts/45comp.h
+++ b/sky/compacts/45comp.h
@@ -629,6 +629,6 @@ uint16 sc45_mouse_list[] = {
 	ID_TEXT_MOUSE
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/46comp.h b/sky/compacts/46comp.h
index 1c17ce12b92..65e20a48879 100644
--- a/sky/compacts/46comp.h
+++ b/sky/compacts/46comp.h
@@ -564,6 +564,6 @@ Compact sc46_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/47comp.h b/sky/compacts/47comp.h
index aec4d06d743..b1847782590 100644
--- a/sky/compacts/47comp.h
+++ b/sky/compacts/47comp.h
@@ -578,6 +578,6 @@ Compact sc47_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/48comp.h b/sky/compacts/48comp.h
index f4dc4966314..9649a5a109b 100644
--- a/sky/compacts/48comp.h
+++ b/sky/compacts/48comp.h
@@ -1162,6 +1162,6 @@ uint16 sc48_light_pal[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/4compact.h b/sky/compacts/4compact.h
index e03fa789677..51ddf834462 100644
--- a/sky/compacts/4compact.h
+++ b/sky/compacts/4compact.h
@@ -1346,6 +1346,6 @@ Compact cupboard_s4 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/5compact.h b/sky/compacts/5compact.h
index e91669c10bd..3f9b1d80d5f 100644
--- a/sky/compacts/5compact.h
+++ b/sky/compacts/5compact.h
@@ -4923,6 +4923,6 @@ void *data_2[] = {
 
 uint32 *table2 = (uint32*)data_2;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/65comp.h b/sky/compacts/65comp.h
index f4c9ab538f4..ba91f581c66 100644
--- a/sky/compacts/65comp.h
+++ b/sky/compacts/65comp.h
@@ -671,6 +671,6 @@ uint16 sc65_palette[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/66comp.h b/sky/compacts/66comp.h
index 44d3fa1e685..f11f3125d5c 100644
--- a/sky/compacts/66comp.h
+++ b/sky/compacts/66comp.h
@@ -6689,6 +6689,6 @@ void *data_5[] = {
 	reset_dad_spec
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/67comp.h b/sky/compacts/67comp.h
index 218a3cd7636..7959835c6ec 100644
--- a/sky/compacts/67comp.h
+++ b/sky/compacts/67comp.h
@@ -2089,6 +2089,6 @@ Compact sc67_clot = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/68comp.h b/sky/compacts/68comp.h
index b9d749b2382..10f8896eb31 100644
--- a/sky/compacts/68comp.h
+++ b/sky/compacts/68comp.h
@@ -1409,6 +1409,6 @@ uint16 sc68_joey_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/69comp.h b/sky/compacts/69comp.h
index 68a85fd5e81..045472001d8 100644
--- a/sky/compacts/69comp.h
+++ b/sky/compacts/69comp.h
@@ -1191,6 +1191,6 @@ Compact sc69_floor = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/70comp.h b/sky/compacts/70comp.h
index c729cd2b817..b1fa9ab8f18 100644
--- a/sky/compacts/70comp.h
+++ b/sky/compacts/70comp.h
@@ -1260,6 +1260,6 @@ uint16 sc70_mouse_list[] = {
 	ID_TEXT_MOUSE
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h
index 54cd493e2ca..6725674e548 100644
--- a/sky/compacts/71comp.h
+++ b/sky/compacts/71comp.h
@@ -1700,6 +1700,6 @@ uint16 sc71_light2_anim[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h
index b6dd4f27343..ef946d0e43e 100644
--- a/sky/compacts/72comp.h
+++ b/sky/compacts/72comp.h
@@ -2414,6 +2414,6 @@ Compact sc72_chamber1 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h
index 399f6129604..2588a2e6682 100644
--- a/sky/compacts/73comp.h
+++ b/sky/compacts/73comp.h
@@ -2546,6 +2546,6 @@ Compact sc73_cham4_light = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/74comp.h b/sky/compacts/74comp.h
index 373dbf815cd..1800b877883 100644
--- a/sky/compacts/74comp.h
+++ b/sky/compacts/74comp.h
@@ -6681,6 +6681,6 @@ uint16 sc74_slot_flash[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/75comp.h b/sky/compacts/75comp.h
index 7f649c37fd8..407ee20ceeb 100644
--- a/sky/compacts/75comp.h
+++ b/sky/compacts/75comp.h
@@ -1910,6 +1910,6 @@ uint16 sc75_get_tiss[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h
index b42c474887b..733a82960c8 100644
--- a/sky/compacts/76comp.h
+++ b/sky/compacts/76comp.h
@@ -2814,6 +2814,6 @@ Compact sc76_door75 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/77comp.h b/sky/compacts/77comp.h
index fce8eb14bd0..f916cad0e3b 100644
--- a/sky/compacts/77comp.h
+++ b/sky/compacts/77comp.h
@@ -1092,6 +1092,6 @@ Compact sc77_door76 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/78comp.h b/sky/compacts/78comp.h
index 81bd0bc7ae3..8d806c8c66c 100644
--- a/sky/compacts/78comp.h
+++ b/sky/compacts/78comp.h
@@ -1204,6 +1204,6 @@ uint16 sc78_fast_list[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/79comp.h b/sky/compacts/79comp.h
index 69aa4b5edf2..f46dfb9fbb0 100644
--- a/sky/compacts/79comp.h
+++ b/sky/compacts/79comp.h
@@ -1655,6 +1655,6 @@ Compact sc79_pipe = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/80comp.h b/sky/compacts/80comp.h
index 5a79546fe3c..437d7aa78b6 100644
--- a/sky/compacts/80comp.h
+++ b/sky/compacts/80comp.h
@@ -3565,6 +3565,6 @@ Compact sc80_goo = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/81comp.h b/sky/compacts/81comp.h
index 52bea3fb914..e7d2af5062c 100644
--- a/sky/compacts/81comp.h
+++ b/sky/compacts/81comp.h
@@ -2762,6 +2762,6 @@ uint16 sc81_foster_sit[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/82comp.h b/sky/compacts/82comp.h
index f9b4635ac1a..e56c52df3e5 100644
--- a/sky/compacts/82comp.h
+++ b/sky/compacts/82comp.h
@@ -712,6 +712,6 @@ uint16 sc82_jobs_return[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/85comp.h b/sky/compacts/85comp.h
index 44d9cfcb481..db1201ebedc 100644
--- a/sky/compacts/85comp.h
+++ b/sky/compacts/85comp.h
@@ -434,6 +434,6 @@ uint16 sc85_logic_list[] = {
 	ID_STD_MENU_LOGIC
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/90comp.h b/sky/compacts/90comp.h
index 76443a451c3..89e4e6c130e 100644
--- a/sky/compacts/90comp.h
+++ b/sky/compacts/90comp.h
@@ -1857,6 +1857,6 @@ void *data_6[] = {
 
 uint32 *sec6_compacts = (uint32*)data_6;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/91comp.h b/sky/compacts/91comp.h
index 4a92a52db2a..909178580e8 100644
--- a/sky/compacts/91comp.h
+++ b/sky/compacts/91comp.h
@@ -1518,6 +1518,6 @@ Compact door_r91f = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/92comp.h b/sky/compacts/92comp.h
index c2e25139c99..7ac3feaae92 100644
--- a/sky/compacts/92comp.h
+++ b/sky/compacts/92comp.h
@@ -1682,6 +1682,6 @@ Compact slab3 = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/93comp.h b/sky/compacts/93comp.h
index cb6eb733ee8..3ef839ebcc2 100644
--- a/sky/compacts/93comp.h
+++ b/sky/compacts/93comp.h
@@ -834,6 +834,6 @@ uint16 pal93[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/94comp.h b/sky/compacts/94comp.h
index 3fedc378be7..6e0ed773f47 100644
--- a/sky/compacts/94comp.h
+++ b/sky/compacts/94comp.h
@@ -1377,6 +1377,6 @@ Compact hologram_a = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/95comp.h b/sky/compacts/95comp.h
index 2a5d8192b68..073d8f44e73 100644
--- a/sky/compacts/95comp.h
+++ b/sky/compacts/95comp.h
@@ -1357,6 +1357,6 @@ uint16 door_l95_anim[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/96comp.h b/sky/compacts/96comp.h
index e928dd523ff..cceead6fe04 100644
--- a/sky/compacts/96comp.h
+++ b/sky/compacts/96comp.h
@@ -924,6 +924,6 @@ uint16 fast_list_sc96[] = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/9compact.h b/sky/compacts/9compact.h
index fa9554c0dc4..d7b52335923 100644
--- a/sky/compacts/9compact.h
+++ b/sky/compacts/9compact.h
@@ -1689,6 +1689,6 @@ uint16 s9_pal[] = {
 	16191
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/linc_gen.h b/sky/compacts/linc_gen.h
index 57dd4c08cba..c1992c47b35 100644
--- a/sky/compacts/linc_gen.h
+++ b/sky/compacts/linc_gen.h
@@ -571,6 +571,6 @@ uint16 rs_foster_s90[] = {
 
 uint32 *grid93 = 0;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/lincmenu.h b/sky/compacts/lincmenu.h
index 2ee1c282c88..e28c7930123 100644
--- a/sky/compacts/lincmenu.h
+++ b/sky/compacts/lincmenu.h
@@ -798,6 +798,6 @@ Compact blind_menu = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/objects.h b/sky/compacts/objects.h
index eb0e015a8f1..299bdd390b7 100644
--- a/sky/compacts/objects.h
+++ b/sky/compacts/objects.h
@@ -1258,6 +1258,6 @@ Compact menu_bar = {
 	0
 };
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h
index 11805441aca..d3da6bdd99e 100644
--- a/sky/compacts/z_compac.h
+++ b/sky/compacts/z_compac.h
@@ -5969,6 +5969,6 @@ void *data_0[] = {
 
 uint32 *z_compact_table = (uint32*)data_0;
 
-}; // namespace SkyCompact
+} // namespace SkyCompact
 
 #endif
diff --git a/sky/debug.cpp b/sky/debug.cpp
index df46f5825bf..cb7ddb067fb 100644
--- a/sky/debug.cpp
+++ b/sky/debug.cpp
@@ -1260,5 +1260,5 @@ void SkyDebug::script(uint32 command, uint16 *scriptData) {
 
 void SkyDebug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) {
 	debug(6, "MCODE: %s(%d, %d, %d)", mcodes[mcode], a, b, c);
-};
+}
 
diff --git a/sky/logic.cpp b/sky/logic.cpp
index 846227fedef..02c4f3cb8b5 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -1148,7 +1148,7 @@ uint16 SkyLogic::mouseScript(uint32 scrNum, Compact *scriptComp) {
 	uint16 retVal = script((uint16)(scrNum & 0xFFFF), (uint16)(scrNum >> 16)); 
 	_compact = tmpComp;
 	return retVal;
-};
+}
 
 /**
  * This is the actual script engine.  It interprets script \a scriptNo starting at \a offset
diff --git a/sword2/console.cpp b/sword2/console.cpp
index 81cbfb46576..bfcbdea3699 100644
--- a/sword2/console.cpp
+++ b/sword2/console.cpp
@@ -1329,11 +1329,11 @@ void Con_display_events()	// (James11july97)
 
 #else // not debug
 
-void	Print_to_console(const char *format,...) {};
-void	Temp_print_to_console(const char *format,...) {};
-void	Clear_console_line(void) {};
-void	Scroll_console(void) {};
-void	Init_console(void) {};
-void	StartConsole(void) {};
+void	Print_to_console(const char *format,...) {}
+void	Temp_print_to_console(const char *format,...) {}
+void	Clear_console_line(void) {}
+void	Scroll_console(void) {}
+void	Init_console(void) {}
+void	StartConsole(void) {}
 
 #endif	// _SWORD2_DEBUG
diff --git a/sword2/debug.cpp b/sword2/debug.cpp
index 41a0e184ad4..6f2cb6891ea 100644
--- a/sword2/debug.cpp
+++ b/sword2/debug.cpp
@@ -547,7 +547,7 @@ void Print_current_info(void)	//Tony30Oct96
 //--------------------------------------------------------------------------------------
 #else // not debug
 
-void Draw_debug_graphics(void) {};
+void Draw_debug_graphics(void) {}
 
 #endif	// _SWORD2_DEBUG
 //--------------------------------------------------------------------------------------