Introduce namespace 'Sky'

svn-id: r12099

121 files changed, 482 insertions, 6 deletions

diff --git a/sky/autoroute.cpp b/sky/autoroute.cpp
index b7784f7987..fc9ecbdad1 100644
--- a/sky/autoroute.cpp
+++ b/sky/autoroute.cpp
@@ -27,6 +27,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define ROUTE_GRID_WIDTH ((GAME_SCREEN_WIDTH/8)+2)
 #define ROUTE_GRID_HEIGHT ((GAME_SCREEN_HEIGHT/8)+2)
 #define ROUTE_GRID_SIZE (ROUTE_GRID_WIDTH*ROUTE_GRID_HEIGHT*2)
@@ -266,3 +268,4 @@ uint16 SkyAutoRoute::autoRoute(Compact *cpt) {
 	return 0;
 }
 
+} // End of namespace Sky
diff --git a/sky/autoroute.h b/sky/autoroute.h
index 79ca196a31..d3c575ac16 100644
--- a/sky/autoroute.h
+++ b/sky/autoroute.h
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 struct Compact;
 class SkyGrid;
 
@@ -48,5 +50,7 @@ private:
 	static const uint16 _logicCommands[4];
 };
 
+} // End of namespace Sky
+
 #endif // AUTOROUTE_H
 
diff --git a/sky/compact.cpp b/sky/compact.cpp
index 0b377e7581..20e8ccaade 100644
--- a/sky/compact.cpp
+++ b/sky/compact.cpp
@@ -37,6 +37,8 @@
 #include "sky/compacts/lincmenu.h"
 #include "sky/compacts/z_compac.h"
 
+namespace Sky {
+
 #define COMPACT_SIZE (sizeof(compactOffsets)/sizeof(uint32))
 #define EXTCOMPACT_SIZE (sizeof(extCompactOffsets)/sizeof(uint32))
 #define MEGASET_SIZE (sizeof(megaSetOffsets)/sizeof(uint32))
@@ -604,3 +606,4 @@ void patchFor288(void) {
 
 }
 
+} // End of namespace Sky
diff --git a/sky/compact.h b/sky/compact.h
index 451140d2c3..c4b091feea 100644
--- a/sky/compact.h
+++ b/sky/compact.h
@@ -26,6 +26,8 @@
 #include "sky/struc.h"
 #include "sky/skydefs.h"
 
+namespace Sky {
+
 namespace SkyCompact {
 	MegaSet *getMegaSet(Compact *cpt, uint16 megaSet);
 	uint16 **getTurnTable(Compact *cpt, uint16 megaSet, uint16 dir);
@@ -3254,4 +3256,6 @@ namespace SkyCompact {
 	extern uint16 minif_auto[];
 }
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h
index 3f64104f73..b7d7b75ada 100644
--- a/sky/compacts/0compact.h
+++ b/sky/compacts/0compact.h
@@ -29,6 +29,8 @@
 #include "1compact.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 slide2_seq[] = {
@@ -9324,4 +9326,6 @@ void *data_1[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/101comp.h b/sky/compacts/101comp.h
index 10af25f9b3..7b572cbad0 100644
--- a/sky/compacts/101comp.h
+++ b/sky/compacts/101comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact cancel_button = {
@@ -884,4 +886,6 @@ uint16 s101_chip_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/102comp.h b/sky/compacts/102comp.h
index 8640106b80..90142a80e8 100644
--- a/sky/compacts/102comp.h
+++ b/sky/compacts/102comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 restore_seq[] = {
@@ -570,4 +572,6 @@ Compact restart_butt = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/10comp.h b/sky/compacts/10comp.h
index 6f1028ae8b..24494949d5 100644
--- a/sky/compacts/10comp.h
+++ b/sky/compacts/10comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 liyt_4_seq[] = {
@@ -2432,4 +2434,6 @@ Compact liyt_1 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/11comp.h b/sky/compacts/11comp.h
index c882a4484a..f034562e9d 100644
--- a/sky/compacts/11comp.h
+++ b/sky/compacts/11comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact slat_3 = {
@@ -1727,4 +1729,6 @@ uint16 cable_fall2_seq[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/12comp.h b/sky/compacts/12comp.h
index f5fa78f82f..7ab7b7cf5d 100644
--- a/sky/compacts/12comp.h
+++ b/sky/compacts/12comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 botbelt_seq[] = {
@@ -2229,4 +2231,6 @@ uint16 topbelt_seq[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h
index 9c6d80e541..4336ed30ed 100644
--- a/sky/compacts/13comp.h
+++ b/sky/compacts/13comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 foreman_l_to_r[] = {
@@ -3767,4 +3769,6 @@ uint16 armsup_seq[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h
index fc155ba632..c9739fd3c0 100644
--- a/sky/compacts/14comp.h
+++ b/sky/compacts/14comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 rs_foster_14_13[] = {
@@ -2075,4 +2077,6 @@ uint16 change6_seq[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/15comp.h b/sky/compacts/15comp.h
index a826e4f82b..0c083f3ece 100644
--- a/sky/compacts/15comp.h
+++ b/sky/compacts/15comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 rs_foster_13_15[] = {
@@ -1108,4 +1110,6 @@ uint16 s15_chip_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/16comp.h b/sky/compacts/16comp.h
index e599913e78..66157406e9 100644
--- a/sky/compacts/16comp.h
+++ b/sky/compacts/16comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact reactor_lower = {
@@ -982,4 +984,6 @@ uint16 fost_con_look[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/17comp.h b/sky/compacts/17comp.h
index 99945baea8..2f212bfe90 100644
--- a/sky/compacts/17comp.h
+++ b/sky/compacts/17comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 pulseb_seq[] = {
@@ -916,4 +918,6 @@ Compact pulse = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/18comp.h b/sky/compacts/18comp.h
index 37c073bb58..74b8ae7eac 100644
--- a/sky/compacts/18comp.h
+++ b/sky/compacts/18comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 steam_alert_seq[] = {
@@ -1603,4 +1605,6 @@ Compact right_exit_s18 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/19comp.h b/sky/compacts/19comp.h
index 925b27b646..cc613420f2 100644
--- a/sky/compacts/19comp.h
+++ b/sky/compacts/19comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 rs_foster_19_28[] = {
@@ -723,4 +725,6 @@ uint16 s19_fast_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/1compact.h b/sky/compacts/1compact.h
index 8f44bb362c..c96eefe235 100644
--- a/sky/compacts/1compact.h
+++ b/sky/compacts/1compact.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 car_down_seq[] = {
@@ -1974,4 +1976,6 @@ uint16 fire1_seq[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/20comp.h b/sky/compacts/20comp.h
index a672732b59..7fb21798f0 100644
--- a/sky/compacts/20comp.h
+++ b/sky/compacts/20comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 gal_look_up[] = {
@@ -1223,4 +1225,6 @@ uint16 s20_mouse[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/21comp.h b/sky/compacts/21comp.h
index afe95beaf8..83e982f396 100644
--- a/sky/compacts/21comp.h
+++ b/sky/compacts/21comp.h
@@ -26,6 +26,8 @@
 #include "22comp.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 lamb_sit_up[] = {
@@ -2144,4 +2146,6 @@ uint16 take_cassette_seq[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/22comp.h b/sky/compacts/22comp.h
index 5cc4278061..6ac7ba044e 100644
--- a/sky/compacts/22comp.h
+++ b/sky/compacts/22comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 fost_replace_pill[] = {
@@ -1583,4 +1585,6 @@ Compact fish_poster = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/23comp.h b/sky/compacts/23comp.h
index 15bdc0d1c5..924bcd944f 100644
--- a/sky/compacts/23comp.h
+++ b/sky/compacts/23comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint32 *grid23 = 0;
@@ -797,4 +799,6 @@ uint16 rs_foster_29_23[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/24comp.h b/sky/compacts/24comp.h
index b19041e493..376cb85a98 100644
--- a/sky/compacts/24comp.h
+++ b/sky/compacts/24comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 give_mag_seq[] = {
@@ -1313,4 +1315,6 @@ uint16 s24_fast_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/25comp.h b/sky/compacts/25comp.h
index 8bd9e9536c..4adc6fab9d 100644
--- a/sky/compacts/25comp.h
+++ b/sky/compacts/25comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sales_chart = {
@@ -1119,4 +1121,6 @@ Compact s25_floor = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/26comp.h b/sky/compacts/26comp.h
index 2e605d8799..efdc6b192f 100644
--- a/sky/compacts/26comp.h
+++ b/sky/compacts/26comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact bio_door = {
@@ -1305,4 +1307,6 @@ Compact s26_floor = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h
index 6e83bb42bd..4220f54787 100644
--- a/sky/compacts/27comp.h
+++ b/sky/compacts/27comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 s27_logic[] = {
@@ -3276,4 +3278,6 @@ Compact chair_27 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/28comp.h b/sky/compacts/28comp.h
index ad606a4a97..cb68c66539 100644
--- a/sky/compacts/28comp.h
+++ b/sky/compacts/28comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 s28_chip_list[] = {
@@ -991,4 +993,6 @@ Compact small_l_28 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/29comp.h b/sky/compacts/29comp.h
index a07f663efe..0974f5d8a1 100644
--- a/sky/compacts/29comp.h
+++ b/sky/compacts/29comp.h
@@ -37,6 +37,8 @@
 #include "10comp.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 rs_joey_7_29[] = {
@@ -1592,4 +1594,6 @@ void *data_3[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h
index 00e8d52eef..bdfa5692bd 100644
--- a/sky/compacts/2compact.h
+++ b/sky/compacts/2compact.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sml_loaderb_l_to_u[] = {
@@ -1822,4 +1824,6 @@ Compact top_barrel = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/30comp.h b/sky/compacts/30comp.h
index b24b01ffba..9d5fcd70fd 100644
--- a/sky/compacts/30comp.h
+++ b/sky/compacts/30comp.h
@@ -42,6 +42,8 @@
 #include "42comp.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc32_vinc_talk[] = {
@@ -6617,4 +6619,6 @@ void *data_4[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/31comp.h b/sky/compacts/31comp.h
index be6f9e5f49..660688d340 100644
--- a/sky/compacts/31comp.h
+++ b/sky/compacts/31comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 reset_start_31[] = {
@@ -2852,4 +2854,6 @@ uint16 sc31_joey_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/32comp.h b/sky/compacts/32comp.h
index c3f4bcd4db..dace349ec8 100644
--- a/sky/compacts/32comp.h
+++ b/sky/compacts/32comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc32_gardening1[] = {
@@ -1838,4 +1840,6 @@ Compact sc32_exit_33 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/33comp.h b/sky/compacts/33comp.h
index 7446f1f344..305ebafeb4 100644
--- a/sky/compacts/33comp.h
+++ b/sky/compacts/33comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc33_lock = {
@@ -826,4 +828,6 @@ uint16 reset_30_33[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/34comp.h b/sky/compacts/34comp.h
index dfa81a305c..af52d79012 100644
--- a/sky/compacts/34comp.h
+++ b/sky/compacts/34comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc34_fast_list[] = {
@@ -956,4 +958,6 @@ Compact sc34_door = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h
index 0bd3cbc980..3066c04576 100644
--- a/sky/compacts/36comp.h
+++ b/sky/compacts/36comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc36_get_glass[] = {
@@ -4271,4 +4273,6 @@ Compact sc36_exit_30 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/37comp.h b/sky/compacts/37comp.h
index 37b2361bc6..ba3d403f5b 100644
--- a/sky/compacts/37comp.h
+++ b/sky/compacts/37comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc37_mouse_list[] = {
@@ -1906,4 +1908,6 @@ uint16 sc37_crbarbox[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h
index 27ba864c39..f35011c9c6 100644
--- a/sky/compacts/38comp.h
+++ b/sky/compacts/38comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 spu_left[] = {
@@ -3830,4 +3832,6 @@ uint16 sc38_lift_down[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/39comp.h b/sky/compacts/39comp.h
index cad8dad7c8..6f434b93ac 100644
--- a/sky/compacts/39comp.h
+++ b/sky/compacts/39comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc39_exit_31 = {
@@ -776,4 +778,6 @@ uint16 sc39_palette[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h
index 3b04bd2577..125bb9c972 100644
--- a/sky/compacts/3compact.h
+++ b/sky/compacts/3compact.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 rs_low_lift2[] = {
@@ -1845,4 +1847,6 @@ Compact low_barrel = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/40comp.h b/sky/compacts/40comp.h
index c59a494367..e0c31b2402 100644
--- a/sky/compacts/40comp.h
+++ b/sky/compacts/40comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc40_body_2 = {
@@ -1222,4 +1224,6 @@ uint16 sc40_ascend[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/41comp.h b/sky/compacts/41comp.h
index f195d1cc80..61412ebd9c 100644
--- a/sky/compacts/41comp.h
+++ b/sky/compacts/41comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc41_mouse_list[] = {
@@ -746,4 +748,6 @@ uint16 sc41_palette[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/42comp.h b/sky/compacts/42comp.h
index fbcd0a2978..7970c31c83 100644
--- a/sky/compacts/42comp.h
+++ b/sky/compacts/42comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc42_jdg_hammer[] = {
@@ -1710,4 +1712,6 @@ uint16 sc42_fos_leave[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/44comp.h b/sky/compacts/44comp.h
index 57a9817e8b..bb3f536103 100644
--- a/sky/compacts/44comp.h
+++ b/sky/compacts/44comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc44_chip_list[] = {
@@ -651,4 +653,6 @@ uint16 reset_37_44[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/45comp.h b/sky/compacts/45comp.h
index 757a3d092d..d0bee9077b 100644
--- a/sky/compacts/45comp.h
+++ b/sky/compacts/45comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 reset_44_45[] = {
@@ -631,4 +633,6 @@ uint16 sc45_mouse_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/46comp.h b/sky/compacts/46comp.h
index 65e20a4887..3ee601af8a 100644
--- a/sky/compacts/46comp.h
+++ b/sky/compacts/46comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc46_floor_table[] = {
@@ -566,4 +568,6 @@ Compact sc46_floor = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/47comp.h b/sky/compacts/47comp.h
index b184778259..00be9ee502 100644
--- a/sky/compacts/47comp.h
+++ b/sky/compacts/47comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 reset_48_47[] = {
@@ -580,4 +582,6 @@ Compact sc47_floor = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/48comp.h b/sky/compacts/48comp.h
index 9649a5a109..58438f6058 100644
--- a/sky/compacts/48comp.h
+++ b/sky/compacts/48comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc48_eyes = {
@@ -1164,4 +1166,6 @@ uint16 sc48_light_pal[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/4compact.h b/sky/compacts/4compact.h
index 51ddf83446..7e4a2a5a88 100644
--- a/sky/compacts/4compact.h
+++ b/sky/compacts/4compact.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 jobs_u_to_l[] = {
@@ -1348,4 +1350,6 @@ Compact cupboard_s4 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/5compact.h b/sky/compacts/5compact.h
index 3f9b1d80d5..e40595ab22 100644
--- a/sky/compacts/5compact.h
+++ b/sky/compacts/5compact.h
@@ -33,6 +33,8 @@
 #include "17comp.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact copter = {
@@ -4925,4 +4927,6 @@ uint32 *table2 = (uint32*)data_2;
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/65comp.h b/sky/compacts/65comp.h
index ba91f581c6..ad4ea801e6 100644
--- a/sky/compacts/65comp.h
+++ b/sky/compacts/65comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint32 *sc65_walk_grid = 0;
@@ -673,4 +675,6 @@ uint16 sc65_palette[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/66comp.h b/sky/compacts/66comp.h
index f11f3125d5..fc662b7ba9 100644
--- a/sky/compacts/66comp.h
+++ b/sky/compacts/66comp.h
@@ -41,6 +41,8 @@
 #include "82comp.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc66_hi_beam_an1[] = {
@@ -6691,4 +6693,6 @@ void *data_5[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/67comp.h b/sky/compacts/67comp.h
index 7959835c6e..585cd09181 100644
--- a/sky/compacts/67comp.h
+++ b/sky/compacts/67comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc67_logic_list[] = {
@@ -2091,4 +2093,6 @@ Compact sc67_clot = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/68comp.h b/sky/compacts/68comp.h
index 10f8896eb3..44a892dd60 100644
--- a/sky/compacts/68comp.h
+++ b/sky/compacts/68comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc68_pulse5 = {
@@ -1411,4 +1413,6 @@ uint16 sc68_joey_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/69comp.h b/sky/compacts/69comp.h
index 045472001d..a803a588bd 100644
--- a/sky/compacts/69comp.h
+++ b/sky/compacts/69comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint32 *grid69 = 0;
@@ -1193,4 +1195,6 @@ Compact sc69_floor = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/70comp.h b/sky/compacts/70comp.h
index b1fa9ab8f1..19c107b59c 100644
--- a/sky/compacts/70comp.h
+++ b/sky/compacts/70comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc70_bar = {
@@ -1262,4 +1264,6 @@ uint16 sc70_mouse_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h
index 6725674e54..8add9ba4ac 100644
--- a/sky/compacts/71comp.h
+++ b/sky/compacts/71comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 medi_d_to_u[] = {
@@ -1702,4 +1704,6 @@ uint16 sc71_light2_anim[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h
index ef946d0e43..249d23834b 100644
--- a/sky/compacts/72comp.h
+++ b/sky/compacts/72comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 wit_st_right[] = {
@@ -2416,4 +2418,6 @@ Compact sc72_chamber1 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h
index 2588a2e668..82c7642996 100644
--- a/sky/compacts/73comp.h
+++ b/sky/compacts/73comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 gal_u_to_l[] = {
@@ -2548,4 +2550,6 @@ Compact sc73_cham4_light = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/74comp.h b/sky/compacts/74comp.h
index 1800b87788..c6267426f7 100644
--- a/sky/compacts/74comp.h
+++ b/sky/compacts/74comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc74_monitor3 = {
@@ -6683,4 +6685,6 @@ uint16 sc74_slot_flash[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/75comp.h b/sky/compacts/75comp.h
index 407ee20cee..67db52426d 100644
--- a/sky/compacts/75comp.h
+++ b/sky/compacts/75comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc75_floor_table[] = {
@@ -1912,4 +1914,6 @@ uint16 sc75_get_tiss[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h
index 733a82960c..a535f3609e 100644
--- a/sky/compacts/76comp.h
+++ b/sky/compacts/76comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 ken_u_to_r[] = {
@@ -2816,4 +2818,6 @@ Compact sc76_door75 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/77comp.h b/sky/compacts/77comp.h
index f916cad0e3..39e1e2eec1 100644
--- a/sky/compacts/77comp.h
+++ b/sky/compacts/77comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc77_fpushl_2[] = {
@@ -1094,4 +1096,6 @@ Compact sc77_door76 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/78comp.h b/sky/compacts/78comp.h
index 8d806c8c66..0aed1e0e24 100644
--- a/sky/compacts/78comp.h
+++ b/sky/compacts/78comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc78_ledge_table[] = {
@@ -1206,4 +1208,6 @@ uint16 sc78_fast_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/79comp.h b/sky/compacts/79comp.h
index f46dfb9fbb..b82248d708 100644
--- a/sky/compacts/79comp.h
+++ b/sky/compacts/79comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc791_palette[] = {
@@ -1657,4 +1659,6 @@ Compact sc79_pipe = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/80comp.h b/sky/compacts/80comp.h
index 437d7aa78b..70157cd967 100644
--- a/sky/compacts/80comp.h
+++ b/sky/compacts/80comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc80_bubble10 = {
@@ -3567,4 +3569,6 @@ Compact sc80_goo = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/81comp.h b/sky/compacts/81comp.h
index e7d2af5062..69d43b8c94 100644
--- a/sky/compacts/81comp.h
+++ b/sky/compacts/81comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact sc81_big_tent3 = {
@@ -2764,4 +2766,6 @@ uint16 sc81_foster_sit[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/82comp.h b/sky/compacts/82comp.h
index e56c52df3e..ad12f1c1ca 100644
--- a/sky/compacts/82comp.h
+++ b/sky/compacts/82comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc82_push_button[] = {
@@ -714,4 +716,6 @@ uint16 sc82_jobs_return[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/85comp.h b/sky/compacts/85comp.h
index db1201ebed..22ed70da90 100644
--- a/sky/compacts/85comp.h
+++ b/sky/compacts/85comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc85_palette[] = {
@@ -436,4 +438,6 @@ uint16 sc85_logic_list[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/90comp.h b/sky/compacts/90comp.h
index 89e4e6c130..c5f6046a7a 100644
--- a/sky/compacts/90comp.h
+++ b/sky/compacts/90comp.h
@@ -33,6 +33,8 @@
 #include "96comp.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact door_r90f = {
@@ -1859,4 +1861,6 @@ uint32 *sec6_compacts = (uint32*)data_6;
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/91comp.h b/sky/compacts/91comp.h
index 909178580e..0b07e46a29 100644
--- a/sky/compacts/91comp.h
+++ b/sky/compacts/91comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact decomp_obj = {
@@ -1520,4 +1522,6 @@ Compact door_r91f = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/92comp.h b/sky/compacts/92comp.h
index 7ac3feaae9..2137cb40c2 100644
--- a/sky/compacts/92comp.h
+++ b/sky/compacts/92comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact bridge_e = {
@@ -1684,4 +1686,6 @@ Compact slab3 = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/93comp.h b/sky/compacts/93comp.h
index 3ef839ebcc..0b39ead7a4 100644
--- a/sky/compacts/93comp.h
+++ b/sky/compacts/93comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 get_adjust[] = {
@@ -836,4 +838,6 @@ uint16 pal93[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/94comp.h b/sky/compacts/94comp.h
index 6e0ed773f4..696c0166d7 100644
--- a/sky/compacts/94comp.h
+++ b/sky/compacts/94comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 door_l94_anim[] = {
@@ -1379,4 +1381,6 @@ Compact hologram_a = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/95comp.h b/sky/compacts/95comp.h
index 073d8f44e7..b4abe9e345 100644
--- a/sky/compacts/95comp.h
+++ b/sky/compacts/95comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 fast_list_sc95[] = {
@@ -1359,4 +1361,6 @@ uint16 door_l95_anim[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/96comp.h b/sky/compacts/96comp.h
index cceead6fe0..26316ea221 100644
--- a/sky/compacts/96comp.h
+++ b/sky/compacts/96comp.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 sc96_mouse[] = {
@@ -926,4 +928,6 @@ uint16 fast_list_sc96[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/9compact.h b/sky/compacts/9compact.h
index d7b5233592..c69c69cf2b 100644
--- a/sky/compacts/9compact.h
+++ b/sky/compacts/9compact.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 s9_floor_table[] = {
@@ -1691,4 +1693,6 @@ uint16 s9_pal[] = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/linc_gen.h b/sky/compacts/linc_gen.h
index c1992c47b3..c4ea377afe 100644
--- a/sky/compacts/linc_gen.h
+++ b/sky/compacts/linc_gen.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 window_mouse[] = {
@@ -573,4 +575,6 @@ uint32 *grid93 = 0;
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/lincmenu.h b/sky/compacts/lincmenu.h
index e28c793012..a4ae6d5a24 100644
--- a/sky/compacts/lincmenu.h
+++ b/sky/compacts/lincmenu.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact playbak_menu = {
@@ -800,4 +802,6 @@ Compact blind_menu = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/objects.h b/sky/compacts/objects.h
index 299bdd390b..024ebbf35f 100644
--- a/sky/compacts/objects.h
+++ b/sky/compacts/objects.h
@@ -25,6 +25,8 @@
 
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 Compact blank5 = {
@@ -1260,4 +1262,6 @@ Compact menu_bar = {
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/compacts/savedata.cpp b/sky/compacts/savedata.cpp
index 29f18aa9a2..30a5cd9e8b 100644
--- a/sky/compacts/savedata.cpp
+++ b/sky/compacts/savedata.cpp
@@ -22,6 +22,8 @@
 #include "sky/compact.h"
 #include "sky/control.h"
 
+namespace Sky {
+
 Compact *SkyControl::_saveLoadCpts[833] = {
 	// 0compact.asm:
 		// Z_compac.inc:
@@ -2150,3 +2152,4 @@ uint8 SkyControl::_resetDiffCd[856] = {
 	0x35, 0x00, 0x34, 0x31, 0x1A, 0x00, 0x36, 0x31
 };
 
+} // End of namespace Sky
diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h
index d3da6bdd99..7024d62e2e 100644
--- a/sky/compacts/z_compac.h
+++ b/sky/compacts/z_compac.h
@@ -29,6 +29,8 @@
 #include "102comp.h"
 
 
+namespace Sky {
+
 namespace SkyCompact {
 
 uint16 fradman_up[] = {
@@ -5971,4 +5973,6 @@ uint32 *z_compact_table = (uint32*)data_0;
 
 } // namespace SkyCompact
 
+} // namespace Sky
+
 #endif
diff --git a/sky/control.cpp b/sky/control.cpp
index d83d06410d..9a6b63b618 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -40,6 +40,8 @@ extern void force_keyboard(bool);
 #endif
 
 
+namespace Sky {
+
 SkyConResource::SkyConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) {
 
 	_spriteData = (dataFileHeader *)pSpData;
@@ -1820,3 +1822,4 @@ uint8 SkyControl::_crossImg[594] = {
 	0xFF, 0xFF
 };
 
+} // End of namespace Sky
diff --git a/sky/control.h b/sky/control.h
index 29111b3f74..2c7e55f069 100644
--- a/sky/control.h
+++ b/sky/control.h
@@ -25,6 +25,10 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 
+class OSystem;
+
+namespace Sky {
+
 class SkyDisk;
 class SkyScreen;
 class SkyLogic;
@@ -32,7 +36,6 @@ class SkyMouse;
 class SkyText;
 class SkyMusicBase;
 class SkySound;
-class OSystem;
 struct Compact;
 struct dataFileHeader;
 struct MegaSet;
@@ -296,4 +299,6 @@ private:
 	static uint8 _crossImg[594];
 };
 
+} // End of namespace Sky
+
 #endif // CONTROL_H
diff --git a/sky/debug.cpp b/sky/debug.cpp
index 65015ee264..60ecfd8fdb 100644
--- a/sky/debug.cpp
+++ b/sky/debug.cpp
@@ -23,6 +23,8 @@
 #include "common/util.h"
 #include "sky/debug.h"
 
+namespace Sky {
+
 static const char *section_0_compacts[] = {
 	"UNDEFINED",
 	"joey",
@@ -1263,3 +1265,4 @@ void SkyDebug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) {
 	debug(6, "MCODE: %s(%d, %d, %d)", mcodes[mcode], a, b, c);
 }
 
+} // End of namespace Sky
diff --git a/sky/debug.h b/sky/debug.h
index 8f0de080fe..ad8ac6d014 100644
--- a/sky/debug.h
+++ b/sky/debug.h
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 class SkyDebug {
 public:
 	static void fetchCompact(uint32 a);
@@ -33,4 +35,6 @@ public:
 	static void mcode(uint32 mcode, uint32 a, uint32 b, uint32 c);
 };
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/disk.cpp b/sky/disk.cpp
index ad9b1fedcd..de17debe83 100644
--- a/sky/disk.cpp
+++ b/sky/disk.cpp
@@ -28,6 +28,8 @@
 #include "sky/sky.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 static const char *dataFilename = "sky.dsk";
 static const char *dinnerFilename = "sky.dnr";
 
@@ -459,3 +461,5 @@ uint32 SkyDisk::determineGameVersion() {
 		break;
 	}
 }
+
+} // End of namespace Sky
diff --git a/sky/disk.h b/sky/disk.h
index 01905a9b2d..448e954ccf 100644
--- a/sky/disk.h
+++ b/sky/disk.h
@@ -28,6 +28,8 @@
 
 class File;
 
+namespace Sky {
+
 #define MAX_FILES_IN_LIST 60
 
 struct PrefFile {
@@ -78,4 +80,6 @@ protected:
 	File *_dnrHandle;
 };
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/grid.cpp b/sky/grid.cpp
index 1069e6f936..1a62d27d44 100644
--- a/sky/grid.cpp
+++ b/sky/grid.cpp
@@ -24,6 +24,8 @@
 #include "sky/grid.h"
 #include "sky/logic.h"
 
+namespace Sky {
+
 #define	GRID_FILE_START	60000
 
 int8 SkyGrid::_gridConvertTable[] = {
@@ -244,3 +246,5 @@ uint8 *SkyGrid::giveGrid(uint32 pScreen)
 {
 	return _gameGrids + GRID_SIZE * _gridConvertTable[pScreen];
 }
+
+} // End of namespace Sky
diff --git a/sky/grid.h b/sky/grid.h
index b71554cc28..43b9530839 100644
--- a/sky/grid.h
+++ b/sky/grid.h
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 struct Compact;
 class SkyDisk;
 
@@ -57,4 +59,6 @@ private:
 	SkyDisk *_skyDisk;
 };
 
+} // End of namespace Sky
+
 #endif //SKYGRID_H
diff --git a/sky/hufftext.cpp b/sky/hufftext.cpp
index acb027e6d9..56a2a3adf4 100644
--- a/sky/hufftext.cpp
+++ b/sky/hufftext.cpp
@@ -21,6 +21,8 @@
 
 #include "text.h"
 
+namespace Sky {
+
 const HuffTree SkyText::_huffTree_00109[] = {
 	{ 1, 22, 0 },
 	{ 2, 9, 0 },
@@ -1998,3 +2000,5 @@ const HuffTree SkyText::_huffTree_00372[] = {
 	{ 0, 0, 148 },
 	{ 0, 0, '!' },
 };
+
+} // End of namespace Sky
diff --git a/sky/intro.cpp b/sky/intro.cpp
index da938a122e..8a11643593 100644
--- a/sky/intro.cpp
+++ b/sky/intro.cpp
@@ -30,6 +30,8 @@
 #include "sky/struc.h"
 #include "sky/text.h"
 
+namespace Sky {
+
 #define SHOWSCREEN		 0
 #define COMMANDEND		 0 // end of COMMANDFLIRT block
 #define FADEUP			 1 // fade up palette
@@ -904,3 +906,5 @@ bool SkyIntro::escDelay(uint32 msecs) {
 	} while (msecs > 0);
 	return true;
 }
+
+} // End of namespace Sky
diff --git a/sky/intro.h b/sky/intro.h
index e26f5b961d..3bd77c5f01 100644
--- a/sky/intro.h
+++ b/sky/intro.h
@@ -26,6 +26,8 @@
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
+namespace Sky {
+
 class SkyDisk;
 class SkyScreen;
 class SkyMusicBase;
@@ -64,5 +66,6 @@ private:
 	void restoreScreen(void);
 };
 
-#endif // INTRO_H
+} // End of namespace Sky
 
+#endif // INTRO_H
diff --git a/sky/logic.cpp b/sky/logic.cpp
index 1ab0ab4c40..bbbc571d00 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -40,6 +40,8 @@
 #include "base/gameDetector.h"
 */
 
+namespace Sky {
+
 uint32 SkyLogic::_scriptVariables[838];
 
 typedef void (SkyLogic::*LogicTable) ();
@@ -2538,3 +2540,4 @@ void SkyLogic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32
 	target->logic = L_TALK; 
 }
 
+} // End of namespace Sky
diff --git a/sky/logic.h b/sky/logic.h
index 78554cd96a..9b39134746 100644
--- a/sky/logic.h
+++ b/sky/logic.h
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/util.h"
 
+namespace Sky {
+
 struct Compact;
 
 enum scriptVariableOffsets {
@@ -274,4 +276,6 @@ protected:
 	SkyControl *_skyControl;
 };
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/mouse.cpp b/sky/mouse.cpp
index d19114a598..54da741034 100644
--- a/sky/mouse.cpp
+++ b/sky/mouse.cpp
@@ -28,6 +28,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define MICE_FILE	60300
 #define NO_MAIN_OBJECTS	24
 #define NO_LINC_OBJECTS	21
@@ -328,3 +330,4 @@ bool SkyMouse::wasClicked(void) {
 		return false;
 }
 
+} // End of namespace Sky
diff --git a/sky/mouse.h b/sky/mouse.h
index b56d382459..61ba24272b 100644
--- a/sky/mouse.h
+++ b/sky/mouse.h
@@ -26,6 +26,9 @@
 #include "common/scummsys.h"
 
 class OSystem;
+
+namespace Sky {
+
 class SkyDisk;
 class SkyLogic;
 
@@ -81,4 +84,6 @@ protected:
 	SkyLogic *_skyLogic;
 };
 
+} // End of namespace Sky
+
 #endif //SKYMOUSE_H
diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp
index 231a434230..0d3802a23d 100644
--- a/sky/music/adlibchannel.cpp
+++ b/sky/music/adlibchannel.cpp
@@ -24,6 +24,8 @@
 #include "sky/music/adlibchannel.h"
 #include "sky/sky.h"
 
+namespace Sky {
+
 SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfData) {
 	_opl = opl;
 	_musicData = pMusicData;
@@ -337,3 +339,5 @@ void SkyAdlibChannel::com90_setStartOfData(void) {
 
 	_channelData.startOfData = _channelData.eventDataPtr;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/adlibchannel.h b/sky/music/adlibchannel.h
index e7f9d27e13..ab942992fb 100644
--- a/sky/music/adlibchannel.h
+++ b/sky/music/adlibchannel.h
@@ -25,6 +25,8 @@
 #include "sky/music/musicbase.h"
 #include "sound/fmopl.h"
 
+namespace Sky {
+
 typedef struct {
 	uint8 ad_Op1, ad_Op2;
 	uint8 sr_Op1, sr_Op2;
@@ -98,4 +100,6 @@ private:
 	//void com90_do_two_Lodsb(void);    // 13
 };
 
+} // End of namespace Sky
+
 #endif //ADLIBCHANNEL_H
diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp
index 1ce6c3aedf..cc4e6cf9ee 100644
--- a/sky/music/adlibmusic.cpp
+++ b/sky/music/adlibmusic.cpp
@@ -24,6 +24,8 @@
 #include "sound/mixer.h"
 #include "sky/sky.h"
 
+namespace Sky {
+
 void SkyAdlibMusic::passMixerFunc(void *param, int16 *buf, uint len) {
 
 	((SkyAdlibMusic*)param)->premixerCall(buf, len);
@@ -130,3 +132,5 @@ void SkyAdlibMusic::startDriver(void) {
 	}
 	_allowedCommands = 0xD;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/adlibmusic.h b/sky/music/adlibmusic.h
index 09782f5512..37c362dac0 100644
--- a/sky/music/adlibmusic.h
+++ b/sky/music/adlibmusic.h
@@ -27,6 +27,8 @@
 
 class SoundMixer;
 
+namespace Sky {
+
 class SkyAdlibMusic : public SkyMusicBase {
 public:
 	SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, OSystem *system);
@@ -45,4 +47,6 @@ private:
 	static void passMixerFunc(void *param, int16 *buf, uint len);
 };
 
+} // End of namespace Sky
+
 #endif //ADLIBMUSIC_H
diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp
index 950e4404c1..2ffcf67ea5 100644
--- a/sky/music/gmchannel.cpp
+++ b/sky/music/gmchannel.cpp
@@ -23,6 +23,8 @@
 #include "common/util.h"
 #include "sound/mididrv.h"
 
+namespace Sky {
+
 SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) {
 
 	_musicData = pMusicData;
@@ -203,3 +205,5 @@ void SkyGmChannel::com90_getChannelControl(void) {
 	_channelData.eventDataPtr += 2;
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | (conNum << 8) | (conDat << 16));
 }
+
+} // End of namespace Sky
diff --git a/sky/music/gmchannel.h b/sky/music/gmchannel.h
index 7214168586..17c5a0f261 100644
--- a/sky/music/gmchannel.h
+++ b/sky/music/gmchannel.h
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 typedef struct {
 	uint16 eventDataPtr;
 	int32 nextEventTime;
@@ -74,4 +76,6 @@ private:
 	void com90_getChannelControl(void);     // 13
 };
 
+} // End of namespace Sky
+
 #endif //SKYGMCHANNEL_H
diff --git a/sky/music/gmmusic.cpp b/sky/music/gmmusic.cpp
index b19486f7d1..c4278c9c46 100644
--- a/sky/music/gmmusic.cpp
+++ b/sky/music/gmmusic.cpp
@@ -25,6 +25,8 @@
 #include "common/util.h"
 #include "sound/mididrv.h"
 
+namespace Sky {
+
 void SkyGmMusic::passTimerFunc(void *param) {
 
 	((SkyGmMusic*)param)->timerCall();
@@ -130,3 +132,4 @@ uint8 SkyGmMusic::_veloTab[128] = {
 	0x7C, 0x7C, 0x7D, 0x7D, 0x7E, 0x7E, 0x7F, 0x7F
 };
 
+} // End of namespace Sky
diff --git a/sky/music/gmmusic.h b/sky/music/gmmusic.h
index 85bb43d033..ab836ed98f 100644
--- a/sky/music/gmmusic.h
+++ b/sky/music/gmmusic.h
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 class SkyGmMusic : public SkyMusicBase {
 public:
 	SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system);
@@ -46,4 +48,6 @@ private:
 	virtual void startDriver(void);
 };
 
+} // End of namespace Sky
+
 #endif //GMMUSIC_H
diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp
index 81937d77cb..c65615f372 100644
--- a/sky/music/mt32music.cpp
+++ b/sky/music/mt32music.cpp
@@ -24,6 +24,8 @@
 #include "common/util.h"
 #include "sound/mididrv.h"
 
+namespace Sky {
+
 void SkyMT32Music::passTimerFunc(void *param) {
 
 	((SkyMT32Music*)param)->timerCall();
@@ -164,3 +166,5 @@ void SkyMT32Music::startDriver(void) {
 	while (processPatchSysEx(sysExData))
 		sysExData += 5;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/mt32music.h b/sky/music/mt32music.h
index 78cc439ac9..928651b4ea 100644
--- a/sky/music/mt32music.h
+++ b/sky/music/mt32music.h
@@ -26,6 +26,8 @@
 
 class MidiDriver;
 
+namespace Sky {
+
 class SkyMT32Music : public SkyMusicBase {
 public:
 	SkyMT32Music(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system);
@@ -46,4 +48,6 @@ private:
 	virtual void startDriver(void);
 };
 
+} // End of namespace Sky
+
 #endif //MT32MUSIC_H
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp
index 640aa64bc4..1843be84d3 100644
--- a/sky/music/musicbase.cpp
+++ b/sky/music/musicbase.cpp
@@ -23,6 +23,8 @@
 #include "sky/disk.h"
 #include "common/util.h"
 
+namespace Sky {
+
 SkyMusicBase::SkyMusicBase(SkyDisk *pSkyDisk, OSystem *system) {
 
 	_musicData = NULL;
@@ -182,3 +184,5 @@ void SkyMusicBase::pollMusic(void) {
 	_system->unlock_mutex(_mutex);
 	_aktTime &= 0xFFFF;
 }
+
+} // End of namespace Sky
diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h
index d5d17986c8..43e993cef2 100644
--- a/sky/music/musicbase.h
+++ b/sky/music/musicbase.h
@@ -26,9 +26,12 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-class SkyDisk;
 class OSystem;
 
+namespace Sky {
+
+class SkyDisk;
+
 #define FILES_PER_SECTION 4
 
 typedef struct {
@@ -91,4 +94,6 @@ protected:
 	void setFMVolume(uint16 param);                                              // 13
 };
 
+} // End of namespace Sky
+
 #endif //MUSICBASE_H
diff --git a/sky/rnc_deco.cpp b/sky/rnc_deco.cpp
index 10a2cb2a02..6db5186a05 100644
--- a/sky/rnc_deco.cpp
+++ b/sky/rnc_deco.cpp
@@ -23,6 +23,8 @@
 #include "common/scummsys.h"
 #include "sky/rnc_deco.h"
 
+namespace Sky {
+
 //return codes
 #define NOT_PACKED	0
 #define PACKED_CRC	-1
@@ -258,3 +260,4 @@ int32 RncDecoder::unpackM1(const void *input, void *output, uint16 key) {
 	return unpackLen;
 }
 
+} // End of namespace Sky
diff --git a/sky/rnc_deco.h b/sky/rnc_deco.h
index a6f875e511..4049011eb8 100644
--- a/sky/rnc_deco.h
+++ b/sky/rnc_deco.h
@@ -24,6 +24,8 @@
 
 #include "stdafx.h"
 
+namespace Sky {
+
 class RncDecoder {
 
 protected:
@@ -54,4 +56,6 @@ protected:
 	
 };
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/screen.cpp b/sky/screen.cpp
index 43f9485336..9967daec02 100644
--- a/sky/screen.cpp
+++ b/sky/screen.cpp
@@ -28,6 +28,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 uint8 SkyScreen::_top16Colours[16*3] = {
 	0, 0, 0,
 	38, 38, 38,
@@ -783,3 +785,4 @@ void SkyScreen::showGrid(uint8 *gridBuf) {
 
 }
 
+} // End of namespace Sky
diff --git a/sky/screen.h b/sky/screen.h
index c891267fde..54f11d163e 100644
--- a/sky/screen.h
+++ b/sky/screen.h
@@ -27,6 +27,9 @@
 #include "sky/skydefs.h"
 
 class OSystem;
+
+namespace Sky {
+
 class SkyDisk;
 class SkyEngine;
 struct Compact;
@@ -123,4 +126,6 @@ private:
 	void vectorToGame(uint8 gridVal);
 };
 
+} // End of namespace Sky
+
 #endif //SKYSCREEN_H
diff --git a/sky/sky.cpp b/sky/sky.cpp
index e4160f97e9..bd9f748b88 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -103,11 +103,14 @@ DetectedGameList Engine_SKY_detectGames(const FSList &fslist) {
 }
 
 Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst) {
-	return new SkyEngine(detector, syst);
+	return new Sky::SkyEngine(detector, syst);
 }
 
 REGISTER_PLUGIN("Beneath a Steel Sky", Engine_SKY_gameList, Engine_SKY_create, Engine_SKY_detectGames)
 
+
+namespace Sky {
+
 void **SkyEngine::_itemList[300];
 
 SystemVars SkyEngine::_systemVars = {0, 0, 0, 0, 4316, 0, 0, false, false };
@@ -538,3 +541,4 @@ bool SkyEngine::isCDVersion(void) {
 	}
 }
 
+} // End of namespace Sky
diff --git a/sky/sky.h b/sky/sky.h
index a0ab6b6c93..d6e2ddd0c1 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -27,6 +27,8 @@
 
 class GameDetector;
 
+namespace Sky {
+
 struct SystemVars {
 	uint32 systemFlags;
 	uint32 gameVersion;
@@ -116,4 +118,6 @@ protected:
 	static int CDECL game_thread_proc(void *param);
 };
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/skydefs.h b/sky/skydefs.h
index 2cb382b20d..e8a2753063 100644
--- a/sky/skydefs.h
+++ b/sky/skydefs.h
@@ -24,6 +24,8 @@
 
 #include "stdafx.h"
 
+namespace Sky {
+
 //This file is incomplete, several flags still missing.
 
 // grafixProg pointer types:
@@ -4305,5 +4307,6 @@
 
 #define TEXT_MOUSE_WIDTH 0x80
 
-#endif
+} // End of namespace Sky
 
+#endif
diff --git a/sky/sound.cpp b/sky/sound.cpp
index 8b8b1725bd..197e4335f7 100644
--- a/sky/sound.cpp
+++ b/sky/sound.cpp
@@ -27,6 +27,8 @@
 #include "sky/sound.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define SOUND_FILE_BASE 60203
 #define MAX_FX_NUMBER 393
 #define SFXF_START_DELAY 0x80
@@ -1245,3 +1247,5 @@ void SkySound::fnUnPauseFx(void) {
 	_mixer->pauseID(SOUND_CH0, false);
 	_mixer->pauseID(SOUND_CH1, false);
 }
+
+} // End of namespace Sky
diff --git a/sky/sound.h b/sky/sound.h
index 4191a343d7..ae835d2451 100644
--- a/sky/sound.h
+++ b/sky/sound.h
@@ -26,6 +26,8 @@
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 
+namespace Sky {
+
 class SkyDisk;
 
 enum {
@@ -87,4 +89,6 @@ private:
 	static SfxQueue _sfxQueue[MAX_QUEUED_FX];
 };
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/struc.h b/sky/struc.h
index c348bf5562..d05b981d24 100644
--- a/sky/struc.h
+++ b/sky/struc.h
@@ -22,6 +22,8 @@
 #ifndef SKYSTRUC_H
 #define SKYSTRUC_H
 
+namespace Sky {
+
 struct lowTextManager_t {
 	byte *textData;
 	uint16 compactNum;
@@ -164,4 +166,6 @@ struct Compact {
 	ExtCompact *extCompact;
 };
 
+} // End of namespace Sky
+
 #endif
diff --git a/sky/talks.h b/sky/talks.h
index 3c3d218471..978e0c194b 100644
--- a/sky/talks.h
+++ b/sky/talks.h
@@ -22,6 +22,8 @@
 #ifndef SKYTALKS_H
 #define SKYTALKS_H
 
+namespace Sky {
+
 namespace SkyTalkAnims {
 
 uint16 show_mag[] = {
@@ -11893,5 +11895,7 @@ bool animTalkTableIsPointer[] = {
 	true
 };
 }
-#endif	//SKYTALKS_H
 
+} // End of namespace Sky
+
+#endif	//SKYTALKS_H
diff --git a/sky/text.cpp b/sky/text.cpp
index b601945f2b..ae728d45ce 100644
--- a/sky/text.cpp
+++ b/sky/text.cpp
@@ -26,6 +26,8 @@
 #include "sky/skydefs.h"
 #include "sky/struc.h"
 
+namespace Sky {
+
 #define FIRST_TEXT_SEC	77
 #define	FIRST_TEXT_BUFFER	274
 #define NO_OF_TEXT_SECTIONS	8	// 8 sections per language
@@ -667,3 +669,5 @@ const uint16 SkyText::_patchLangNum[8] = {
 	0, // SKY_PORTUGUESE
 	0  // SKY_SPANISH
 };
+
+} // End of namespace Sky
diff --git a/sky/text.h b/sky/text.h
index a29a653bc6..9c4566f120 100644
--- a/sky/text.h
+++ b/sky/text.h
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Sky {
+
 struct Compact;
 class SkyDisk;
 
@@ -117,4 +119,6 @@ public:
 	uint32 _dtLetters;	//no of chars in message
 };
 
+} // End of namespace Sky
+
 #endif