AVALANCHE: Add namespace.

202 files changed, 723 insertions, 92 deletions

diff --git a/engines/avalanche/1stoff.cpp b/engines/avalanche/1stoff.cpp
index 12db75ae57..0f9e19b940 100644
--- a/engines/avalanche/1stoff.cpp
+++ b/engines/avalanche/1stoff.cpp
@@ -28,6 +28,7 @@
 /*#include "Crt.h"*/
 /*#include "Dos.h"*/
 
+namespace Avalanche {
 
 matrix<1,7,1,3,byte> cols;
 byte fv;
@@ -78,4 +79,6 @@ int main(int argc, const char* argv[])
  }
 
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/access.cpp b/engines/avalanche/access.cpp
index a36a3e5bd9..951bc1c818 100644
--- a/engines/avalanche/access.cpp
+++ b/engines/avalanche/access.cpp
@@ -44,6 +44,7 @@
 /*#include "Trip5.h"*/
 /*#include "Lucerna.h"*/
 
+namespace Avalanche {
 
 boolean int_say_went_ok;
 
@@ -192,4 +193,4 @@ void talkto(byte whom)
  }
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/access.h b/engines/avalanche/access.h
index ff2d3af766..e985953c7f 100644
--- a/engines/avalanche/access.h
+++ b/engines/avalanche/access.h
@@ -28,9 +28,12 @@
 #ifndef __access_h__
 #define __access_h__
 
+namespace Avalanche {
 
 void dixi(char p, byte n);
 
 void talkto(byte whom);
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/acci.cpp b/engines/avalanche/acci.cpp
index 703785f148..f33d7c2ea0 100644
--- a/engines/avalanche/acci.cpp
+++ b/engines/avalanche/acci.cpp
@@ -53,6 +53,7 @@
 /*#include "Helper.h"*/
 /*#include "Sequence.h"*/
 
+namespace Avalanche {
 
 byte fv;
 
@@ -1694,3 +1695,5 @@ static unit_acci_initialize acci_constructor;
 unit_acci_initialize::unit_acci_initialize() {
  weirdword=false;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/acci.h b/engines/avalanche/acci.h
index 7049199aed..6734f6658e 100644
--- a/engines/avalanche/acci.h
+++ b/engines/avalanche/acci.h
@@ -28,6 +28,7 @@
 #ifndef __acci_h__
 #define __acci_h__
 
+namespace Avalanche {
 
 /* verb codes */
 const char vb_exam = '\1'; const char vb_open = '\2'; const char vb_pause = '\3'; const char vb_get = '\4'; const char vb_drop = '\5';
@@ -247,4 +248,6 @@ void do_that();
 void verbopt(char n, string& answer, char& anskey);
 void have_a_drink();
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/also.cpp b/engines/avalanche/also.cpp
index 5429331743..83dce5241b 100644
--- a/engines/avalanche/also.cpp
+++ b/engines/avalanche/also.cpp
@@ -31,6 +31,8 @@
 
 /*$R+,V-*/
 
+namespace Avalanche {
+
 typedef matrix<0,255,0,15,byte> fonttype;
 
 class fieldtype {
@@ -1050,3 +1052,5 @@ int main(int argc, const char* argv[])
  alsomenu();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/andexor.cpp b/engines/avalanche/andexor.cpp
index 1902ecd1dd..df654117b8 100644
--- a/engines/avalanche/andexor.cpp
+++ b/engines/avalanche/andexor.cpp
@@ -28,6 +28,8 @@
 /* Trippancy IV - original file */
 #include "graph.h"
 
+namespace Avalanche {
+
 const integer taboo = cyan;
 
 struct adxtype {
@@ -144,4 +146,6 @@ int main(int argc, const char* argv[])
  close(f);
  closegraph();
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/andexor2.cpp b/engines/avalanche/andexor2.cpp
index 670a3ded46..136f719afe 100644
--- a/engines/avalanche/andexor2.cpp
+++ b/engines/avalanche/andexor2.cpp
@@ -28,6 +28,8 @@
 /* Trippancy IV - original file */
 #include "graph.h"
 
+namespace Avalanche {
+
 const integer taboo = cyan;
 
 struct adxtype {
@@ -155,4 +157,6 @@ int main(int argc, const char* argv[])
  close(f);
  closegraph();
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/andextst.cpp b/engines/avalanche/andextst.cpp
index 3abfbacfc4..2cfe410b98 100644
--- a/engines/avalanche/andextst.cpp
+++ b/engines/avalanche/andextst.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 typedef matrix<1,24,0,1,pointer> adxtype;
 
@@ -85,4 +86,6 @@ int main(int argc, const char* argv[])
   anim += 1; if (anim==7)  anim=1;cp=1-cp;
  } while (!false);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/arch.cpp b/engines/avalanche/arch.cpp
index f488a86189..815018df8a 100644
--- a/engines/avalanche/arch.cpp
+++ b/engines/avalanche/arch.cpp
@@ -41,6 +41,7 @@
 /*#include "Dos.h"*/
 #include "scrolls.h"
 
+namespace Avalanche {
 
 struct ednahead { /* Edna header */
           /* This header starts at byte offset 177 in the .ASG file. */
@@ -144,4 +145,4 @@ void save(string name)
  close(f);
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/arch.h b/engines/avalanche/arch.h
index 781217a978..840ceb446e 100644
--- a/engines/avalanche/arch.h
+++ b/engines/avalanche/arch.h
@@ -31,7 +31,10 @@
 
 #include "gyro.h"
 
+namespace Avalanche {
 
 void save(string name);
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/avalot9.cpp b/engines/avalanche/avalot9.cpp
index 8f36226d53..f793fa5402 100644
--- a/engines/avalanche/avalot9.cpp
+++ b/engines/avalanche/avalot9.cpp
@@ -51,6 +51,8 @@
 /*#include "Visa.h"*/
 
 
+namespace Avalanche {
+
 void setup()
 {
  integer gd,gm;
@@ -137,3 +139,5 @@ int main(int argc, const char* argv[])
 }
 
 /*  typein; commanded; last:=current; */
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/avbkgrnd.cpp b/engines/avalanche/avbkgrnd.cpp
index f57b0f4a46..0ca6b721a0 100644
--- a/engines/avalanche/avbkgrnd.cpp
+++ b/engines/avalanche/avbkgrnd.cpp
@@ -27,6 +27,9 @@
 
 #include "graph.h"
 
+
+namespace Avalanche {
+
 integer gd,gm;
 int main(int argc, const char* argv[])
 {pio_initialize(argc, argv);
@@ -110,3 +113,5 @@ int main(int argc, const char* argv[])
 */
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/avmenu.cpp b/engines/avalanche/avmenu.cpp
index d7bfac56ff..31c26929b6 100644
--- a/engines/avalanche/avmenu.cpp
+++ b/engines/avalanche/avmenu.cpp
@@ -29,6 +29,8 @@
 /*#include "Crt.h"*/
 /*#include "Tommys.h"*/
 
+namespace Avalanche {
+
 typedef matrix<'\0','\377',0,15,byte> fonttype;
 
 fonttype font;
@@ -334,3 +336,5 @@ int main(int argc, const char* argv[])
  closegraph();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/avvyans.cpp b/engines/avalanche/avvyans.cpp
index 4105eaf9d1..fa70ca1751 100644
--- a/engines/avalanche/avvyans.cpp
+++ b/engines/avalanche/avvyans.cpp
@@ -28,6 +28,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 untyped_file f;
 array<1,16000,byte> aa;
@@ -105,4 +107,6 @@ int main(int argc, const char* argv[])
   gotoxy(1,1);
   input >> NL;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/avvyans2.cpp b/engines/avalanche/avvyans2.cpp
index b425b56c1e..b7f96a5b5d 100644
--- a/engines/avalanche/avvyans2.cpp
+++ b/engines/avalanche/avvyans2.cpp
@@ -29,6 +29,8 @@
 /*#include "Crt.h"*/
 /*#include "Ansi.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 untyped_file f;
 array<1,16000,byte> aa;
@@ -206,4 +208,6 @@ int main(int argc, const char* argv[])
  output << NL;
  normal;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/avvymonk.cpp b/engines/avalanche/avvymonk.cpp
index 6267a047e6..25fc83e405 100644
--- a/engines/avalanche/avvymonk.cpp
+++ b/engines/avalanche/avvymonk.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 byte z;
 array<1,4,pointer> a;
@@ -93,4 +95,6 @@ int main(int argc, const char* argv[])
  }
  savesc();
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/bakchunk.cpp b/engines/avalanche/bakchunk.cpp
index b005b03819..fabda148f7 100644
--- a/engines/avalanche/bakchunk.cpp
+++ b/engines/avalanche/bakchunk.cpp
@@ -29,6 +29,8 @@
 /*#include "Celer.h"*/
 /*#include "Lucerna.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 int main(int argc, const char* argv[])
 {
@@ -49,4 +51,6 @@ int main(int argc, const char* argv[])
  outtextxy(100,50,"Chunk1");
  input >> NL;
  return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/basher.cpp b/engines/avalanche/basher.cpp
index 5210631033..b4ceeb389a 100644
--- a/engines/avalanche/basher.cpp
+++ b/engines/avalanche/basher.cpp
@@ -54,6 +54,7 @@
 #include "Sticks.h"
 #include "enid.h"
 
+namespace Avalanche {
 
 boolean entering_filename;
 byte left_margin;
@@ -408,3 +409,5 @@ unit_basher_initialize::unit_basher_initialize() {
  #endif
 
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/basher.h b/engines/avalanche/basher.h
index a1996c82ee..ba26d926a9 100644
--- a/engines/avalanche/basher.h
+++ b/engines/avalanche/basher.h
@@ -32,6 +32,7 @@
 #include "gyro.h"
 /*#include "Tommys.h"*/
 
+namespace Avalanche {
 
 #ifdef RECORD
 
@@ -64,4 +65,6 @@ EXTERN word count;
   void record_one();
 #endif
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/bootstrp.cpp b/engines/avalanche/bootstrp.cpp
index ff4ab389f7..905944796a 100644
--- a/engines/avalanche/bootstrp.cpp
+++ b/engines/avalanche/bootstrp.cpp
@@ -30,6 +30,8 @@
 
 /*$M 8192,0,$6000, S-*/
 
+namespace Avalanche {
+
 enum elm {normal, musical, elmpoyten, regi, last_elm};
 
 const integer run_shootemup = 1;
@@ -371,3 +373,5 @@ int main(int argc, const char* argv[])
  } while (!false);
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/cadburys.cpp b/engines/avalanche/cadburys.cpp
index 21c65ae3b5..8d1e0c33ad 100644
--- a/engines/avalanche/cadburys.cpp
+++ b/engines/avalanche/cadburys.cpp
@@ -33,7 +33,7 @@
 
 #include "graph.h"
 
-
+namespace Avalanche {
 
 void mgrab(integer x1,integer y1,integer x2,integer y2, word size)
 {
@@ -131,4 +131,4 @@ void grab(integer x1,integer y1,integer x2,integer y2,integer realx,integer real
 /* rectangle(x1,y1,x2,y2);*/
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/cadburys.h b/engines/avalanche/cadburys.h
index b513510cec..325bd35e47 100644
--- a/engines/avalanche/cadburys.h
+++ b/engines/avalanche/cadburys.h
@@ -28,6 +28,7 @@
 #ifndef __cadburys_h__
 #define __cadburys_h__
 
+namespace Avalanche {
 
 const integer arraysize = 12000;
 
@@ -65,4 +66,6 @@ EXTERN untyped_file f;
 void grab(integer x1,integer y1,integer x2,integer y2,integer realx,integer realy, flavourtype flav,
  boolean mem,boolean nat);
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/celer.cpp b/engines/avalanche/celer.cpp
index c456378419..1038e6f777 100644
--- a/engines/avalanche/celer.cpp
+++ b/engines/avalanche/celer.cpp
@@ -34,7 +34,6 @@
 
 #define __celer_implementation__
 
-
 #include "celer.h"
 
 
@@ -43,6 +42,7 @@
 #include "lucerna.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 untyped_file f; /* Private variable- not accessible from elsewhere. */
 
@@ -495,3 +495,5 @@ static unit_celer_initialize celer_constructor;
 unit_celer_initialize::unit_celer_initialize() {
  num_chunks=0;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/celer.h b/engines/avalanche/celer.h
index ff608ea83c..c48bb468e7 100644
--- a/engines/avalanche/celer.h
+++ b/engines/avalanche/celer.h
@@ -33,6 +33,7 @@
 #include "incline.h"
 #include "gyro.h"
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -77,4 +78,6 @@ EXTERN array<1,40,pointer> memory;
 
    void show_one_at(byte which, integer xxx,integer yyy);
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/ch_egats.cpp b/engines/avalanche/ch_egats.cpp
index 9a9718b55b..a109127664 100644
--- a/engines/avalanche/ch_egats.cpp
+++ b/engines/avalanche/ch_egats.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -177,3 +178,5 @@ int main(int argc, const char* argv[])
  close(f);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/charmap.cpp b/engines/avalanche/charmap.cpp
index f42bf31264..985bbf0707 100644
--- a/engines/avalanche/charmap.cpp
+++ b/engines/avalanche/charmap.cpp
@@ -27,6 +27,8 @@
 
 /*#include "Dos.h"*/
 
+namespace Avalanche {
+
 struct infotype {
             matrix<128,255,1,8,byte> chars;
             string data;
@@ -51,4 +53,6 @@ int main(int argc, const char* argv[])
   output << NL;
  } }
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunker.cpp b/engines/avalanche/chunker.cpp
index 46848dac7c..4b7dd0e9fd 100644
--- a/engines/avalanche/chunker.cpp
+++ b/engines/avalanche/chunker.cpp
@@ -25,6 +25,8 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
+namespace Avalanche {
+
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
 struct chunkblocktype {
@@ -106,4 +108,6 @@ int main(int argc, const char* argv[])
 
    close(f);
    return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf1.cpp b/engines/avalanche/chunkxf1.cpp
index 44e1725401..5118d7d916 100644
--- a/engines/avalanche/chunkxf1.cpp
+++ b/engines/avalanche/chunkxf1.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 #include "cadburys.h"
 
+namespace Avalanche {
 
 /*type
  flavourtype = (ch_EGA,ch_BGI);
@@ -281,3 +282,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf2.cpp b/engines/avalanche/chunkxf2.cpp
index ee7908578c..3b6caa78e7 100644
--- a/engines/avalanche/chunkxf2.cpp
+++ b/engines/avalanche/chunkxf2.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -214,3 +215,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf3.cpp b/engines/avalanche/chunkxf3.cpp
index 26b3b49ac5..ab27863f3b 100644
--- a/engines/avalanche/chunkxf3.cpp
+++ b/engines/avalanche/chunkxf3.cpp
@@ -30,6 +30,7 @@
 /*#include "Crt.h"*/
 #include "cadburys.h"
 
+namespace Avalanche {
 
 /*type
  flavourtype = (ch_EGA,ch_BGI);
@@ -272,3 +273,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf4.cpp b/engines/avalanche/chunkxf4.cpp
index 2083f5b480..0ac2e1f85c 100644
--- a/engines/avalanche/chunkxf4.cpp
+++ b/engines/avalanche/chunkxf4.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -307,3 +308,5 @@ int main(int argc, const char* argv[])
  close_chunk();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf5.cpp b/engines/avalanche/chunkxf5.cpp
index 9300c7b6ce..c4041d67f4 100644
--- a/engines/avalanche/chunkxf5.cpp
+++ b/engines/avalanche/chunkxf5.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -266,3 +267,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf6.cpp b/engines/avalanche/chunkxf6.cpp
index 3798e5cc72..b2c6cf4b02 100644
--- a/engines/avalanche/chunkxf6.cpp
+++ b/engines/avalanche/chunkxf6.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -273,3 +274,6 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf7.cpp b/engines/avalanche/chunkxf7.cpp
index fc8da304f8..c1f189b2ce 100644
--- a/engines/avalanche/chunkxf7.cpp
+++ b/engines/avalanche/chunkxf7.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -258,3 +259,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf8.cpp b/engines/avalanche/chunkxf8.cpp
index 30be8450e6..97b9502dc3 100644
--- a/engines/avalanche/chunkxf8.cpp
+++ b/engines/avalanche/chunkxf8.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -265,3 +266,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxf9.cpp b/engines/avalanche/chunkxf9.cpp
index 48f5bd28ba..ddf079c7af 100644
--- a/engines/avalanche/chunkxf9.cpp
+++ b/engines/avalanche/chunkxf9.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -259,3 +260,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfa.cpp b/engines/avalanche/chunkxfa.cpp
index a574a04f94..b2faafe4d5 100644
--- a/engines/avalanche/chunkxfa.cpp
+++ b/engines/avalanche/chunkxfa.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -262,3 +263,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfb.cpp b/engines/avalanche/chunkxfb.cpp
index 2ae8f852d8..5249e6c6f5 100644
--- a/engines/avalanche/chunkxfb.cpp
+++ b/engines/avalanche/chunkxfb.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -260,3 +261,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfc.cpp b/engines/avalanche/chunkxfc.cpp
index 292cc1a328..4c2e58b6ed 100644
--- a/engines/avalanche/chunkxfc.cpp
+++ b/engines/avalanche/chunkxfc.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -258,3 +259,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfd.cpp b/engines/avalanche/chunkxfd.cpp
index 270d253466..efc94acfee 100644
--- a/engines/avalanche/chunkxfd.cpp
+++ b/engines/avalanche/chunkxfd.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -258,3 +259,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfe.cpp b/engines/avalanche/chunkxfe.cpp
index ef42c8af40..16e4aa1d04 100644
--- a/engines/avalanche/chunkxfe.cpp
+++ b/engines/avalanche/chunkxfe.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -258,3 +259,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxff.cpp b/engines/avalanche/chunkxff.cpp
index eddbc2ddec..fa9224be0f 100644
--- a/engines/avalanche/chunkxff.cpp
+++ b/engines/avalanche/chunkxff.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -258,3 +259,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfg.cpp b/engines/avalanche/chunkxfg.cpp
index 0e980e6f0f..cc43d7d933 100644
--- a/engines/avalanche/chunkxfg.cpp
+++ b/engines/avalanche/chunkxfg.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -258,3 +259,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfh.cpp b/engines/avalanche/chunkxfh.cpp
index bd303ad163..9ebdbfa614 100644
--- a/engines/avalanche/chunkxfh.cpp
+++ b/engines/avalanche/chunkxfh.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -259,3 +260,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfi.cpp b/engines/avalanche/chunkxfi.cpp
index 52f3be110f..3dd81b2491 100644
--- a/engines/avalanche/chunkxfi.cpp
+++ b/engines/avalanche/chunkxfi.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -268,3 +269,5 @@ int main(int argc, const char* argv[])
  close_chunk();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfj.cpp b/engines/avalanche/chunkxfj.cpp
index 792c0b52e3..4c37792546 100644
--- a/engines/avalanche/chunkxfj.cpp
+++ b/engines/avalanche/chunkxfj.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -259,3 +260,5 @@ int main(int argc, const char* argv[])
  close_chunk();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfk.cpp b/engines/avalanche/chunkxfk.cpp
index 86f49359c3..505c4fd8c2 100644
--- a/engines/avalanche/chunkxfk.cpp
+++ b/engines/avalanche/chunkxfk.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi, last_flavourtype};
 
@@ -259,3 +260,5 @@ int main(int argc, const char* argv[])
  close_chunk();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/chunkxfl.cpp b/engines/avalanche/chunkxfl.cpp
index 7fdb52bd1c..4091890bef 100644
--- a/engines/avalanche/chunkxfl.cpp
+++ b/engines/avalanche/chunkxfl.cpp
@@ -30,6 +30,7 @@
 /*#include "Crt.h"*/
 #include "cadburys.h"
 
+namespace Avalanche {
 
 void finder()
 {
@@ -149,3 +150,5 @@ int main(int argc, const char* argv[])
  close_chunk();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/clock.cpp b/engines/avalanche/clock.cpp
index ebdc85b1fa..fb05ad5497 100644
--- a/engines/avalanche/clock.cpp
+++ b/engines/avalanche/clock.cpp
@@ -29,6 +29,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 const integer xm = 511; const integer ym = 184;
 integer gd,gm;
 word oh,om,/*os,*/h,m,s,s1; char r;
@@ -81,4 +83,6 @@ int main(int argc, const char* argv[])
   oh=h; om=m;
  } while (!false);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/closing.cpp b/engines/avalanche/closing.cpp
index 722ff3764c..bc3134b2e0 100644
--- a/engines/avalanche/closing.cpp
+++ b/engines/avalanche/closing.cpp
@@ -43,6 +43,7 @@
 /*#include "Crt.h"*/
 #include "lucerna.h"
 
+namespace Avalanche {
 
 typedef array<1,3840,char> scrtype;
 
@@ -142,3 +143,5 @@ unit_closing_initialize::unit_closing_initialize() {;
  exitsave=exitproc;
  exitproc=&bug_handler;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/closing.h b/engines/avalanche/closing.h
index 3d33cd65d0..a4d539fe7b 100644
--- a/engines/avalanche/closing.h
+++ b/engines/avalanche/closing.h
@@ -28,6 +28,7 @@
 #ifndef __closing_h__
 #define __closing_h__
 
+namespace Avalanche {
 
 const integer scr_bugalert = 1;
 const integer scr_ramcram = 2;
@@ -39,4 +40,6 @@ void quit_with(byte which,byte errorlev);
 
 void end_of_program();
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/convert.cpp b/engines/avalanche/convert.cpp
index d350f23396..b8d986d73e 100644
--- a/engines/avalanche/convert.cpp
+++ b/engines/avalanche/convert.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 string fn1,fn2;
 varying_string<30> desc;
@@ -101,3 +103,5 @@ int main(int argc, const char* argv[])
  closegraph();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/convmous.cpp b/engines/avalanche/convmous.cpp
index 53147ca4ed..97da69a4d3 100644
--- a/engines/avalanche/convmous.cpp
+++ b/engines/avalanche/convmous.cpp
@@ -29,6 +29,7 @@
 /*#include "Binu.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
        /* ...gogogoch */struct cursor {
                           matrix<0,1,0,15,word> mask;
@@ -101,4 +102,6 @@ int main(int argc, const char* argv[])
  load();
  display();
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/credits.cpp b/engines/avalanche/credits.cpp
index 6d33127d47..b3db08e392 100644
--- a/engines/avalanche/credits.cpp
+++ b/engines/avalanche/credits.cpp
@@ -30,6 +30,8 @@
 
 /*$R+*/
 
+namespace Avalanche {
+
 typedef matrix<'\0','\377',0,15,byte> fonttype;
 
 integer gd,gm;
@@ -110,3 +112,5 @@ int main(int argc, const char* argv[])
  close(t);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/displtxt.cpp b/engines/avalanche/displtxt.cpp
index be06790112..0db15d55c7 100644
--- a/engines/avalanche/displtxt.cpp
+++ b/engines/avalanche/displtxt.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const char fn[] = "text3.scr";
 
@@ -56,3 +57,5 @@ int main(int argc, const char* argv[])
  gotoxy(1,25); textattr=31; clreol; gotoxy(1,24);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/dropdown.cpp b/engines/avalanche/dropdown.cpp
index c88d06a200..5637401259 100644
--- a/engines/avalanche/dropdown.cpp
+++ b/engines/avalanche/dropdown.cpp
@@ -48,6 +48,8 @@
 #include "enid.h"
 #include "basher.h"
 
+namespace Avalanche {
+
 /*$V-*/
 const integer indent = 5;
 const integer spacing = 10;
@@ -824,4 +826,4 @@ void menu_link()
  }
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/dropdown.h b/engines/avalanche/dropdown.h
index ac22571350..4eae8982ed 100644
--- a/engines/avalanche/dropdown.h
+++ b/engines/avalanche/dropdown.h
@@ -28,6 +28,7 @@
 #ifndef __dropdown_h__
 #define __dropdown_h__
 
+namespace Avalanche {
 
 typedef void(*proc)();
 
@@ -118,4 +119,6 @@ EXTERN varying_string<5> people;
   void standard_bar();
   /*procedure map_bar;*/
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/dwidth.cpp b/engines/avalanche/dwidth.cpp
index 67dbdc7bea..450ee7b532 100644
--- a/engines/avalanche/dwidth.cpp
+++ b/engines/avalanche/dwidth.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 typedef matrix<'\0','\377',0,15,byte> fonttype;
 
@@ -42,3 +43,5 @@ int main(int argc, const char* argv[])
  for( gd=0; gd <= 15; gd ++) mem[0xa000*gd*80]=f['A'][gd];
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/edhead.cpp b/engines/avalanche/edhead.cpp
index 9907281c89..ab7b1b8b3d 100644
--- a/engines/avalanche/edhead.cpp
+++ b/engines/avalanche/edhead.cpp
@@ -25,6 +25,8 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
+namespace Avalanche {
+
 const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
 const string ednaid = string("TT")+'\261'+'\36'+'\1'+'\113'+'\261'+'\231'+'\261';
 
@@ -107,3 +109,5 @@ int main(int argc, const char* argv[])
  output << "Number of saves: " << dna256[6] << NL;
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/edna.cpp b/engines/avalanche/edna.cpp
index 03d9c232fb..1c4d8d76b5 100644
--- a/engines/avalanche/edna.cpp
+++ b/engines/avalanche/edna.cpp
@@ -30,6 +30,7 @@
 /*#include "Dos.h"*/
 /*#include "Tommys.h"*/
 
+namespace Avalanche {
 
 struct ednahead { /* Edna header */
           /* This header starts at byte offset 177 in the .ASG file. */
@@ -359,4 +360,6 @@ int main(int argc, const char* argv[])
   if (info)  show_info();
   load_file();
   return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/enhanced.cpp b/engines/avalanche/enhanced.cpp
index 634ad63a71..212e6fe6a1 100644
--- a/engines/avalanche/enhanced.cpp
+++ b/engines/avalanche/enhanced.cpp
@@ -38,6 +38,7 @@
 /*#include "Dos.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 boolean isenh()
 {
@@ -109,3 +110,5 @@ unit_enhanced_initialize::unit_enhanced_initialize() {;
  /* determine bios type */
  atbios=isenh();
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/enhanced.h b/engines/avalanche/enhanced.h
index c7031a213b..c7bd48f8a1 100644
--- a/engines/avalanche/enhanced.h
+++ b/engines/avalanche/enhanced.h
@@ -28,7 +28,7 @@
 #ifndef __enhanced_h__
 #define __enhanced_h__
 
-
+namespace Avalanche {
 
 #ifdef __enhanced_implementation__
 #undef EXTERN
@@ -46,4 +46,6 @@ void readkeye();
 
 boolean keypressede();
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/enid.cpp b/engines/avalanche/enid.cpp
index e6d9106b82..7305d94d03 100644
--- a/engines/avalanche/enid.cpp
+++ b/engines/avalanche/enid.cpp
@@ -50,6 +50,7 @@
 #include "fileunit.h"
 #include "basher.h"
 
+namespace Avalanche {
 
 const string crlf = string('\15')+'\12';
 const char tab = '\11';
@@ -603,4 +604,4 @@ boolean there_was_a_problem()
  return there_was_a_problem_result;
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/enid.h b/engines/avalanche/enid.h
index ce9f5fd69d..d9f0a5416f 100644
--- a/engines/avalanche/enid.h
+++ b/engines/avalanche/enid.h
@@ -31,6 +31,7 @@
 
 #include "gyro.h"
 
+namespace Avalanche {
 
 void edna_save(string name);
 
@@ -46,4 +47,6 @@ void back_to_bootstrap(byte what);
 
 boolean there_was_a_problem();
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/filer.cpp b/engines/avalanche/filer.cpp
index 5fbc5b39a3..c96f445bde 100644
--- a/engines/avalanche/filer.cpp
+++ b/engines/avalanche/filer.cpp
@@ -33,6 +33,8 @@
 
 /*$V-*/
 
+namespace Avalanche {
+
 struct windowtype {
               integer x1,y1,x2,y2;
               varying_string<20> title;
@@ -813,3 +815,5 @@ int main(int argc, const char* argv[])
  input >> NL;
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/fileunit.cpp b/engines/avalanche/fileunit.cpp
index 26ab496844..00c19ede68 100644
--- a/engines/avalanche/fileunit.cpp
+++ b/engines/avalanche/fileunit.cpp
@@ -41,6 +41,8 @@
 
 /*$V-*/
 
+namespace Avalanche {
+
 struct windowtype {
               integer x1,y1,x2,y2;
               varying_string<20> title;
@@ -1140,4 +1142,4 @@ string do_filer()
  return do_filer_result;
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/fileunit.h b/engines/avalanche/fileunit.h
index ce7d07a85c..034d1e5914 100644
--- a/engines/avalanche/fileunit.h
+++ b/engines/avalanche/fileunit.h
@@ -28,7 +28,10 @@
 #ifndef __fileunit_h__
 #define __fileunit_h__
 
+namespace Avalanche {
 
 string do_filer();        /* Result is filename, or "" if cancelled. */
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/filing.cpp b/engines/avalanche/filing.cpp
index a272107b2c..51c9334b7d 100644
--- a/engines/avalanche/filing.cpp
+++ b/engines/avalanche/filing.cpp
@@ -39,6 +39,7 @@
 
 /*#include "Gyro.h"*/
 
+namespace Avalanche {
 
 const array<1,12,varying_string<6> > months = 
  {{"Jan*","Feb*","March","April","May","June","July","August",
@@ -166,4 +167,6 @@ int main(int argc, const char* argv[])
   output << "Number of saves: " << e.saves << NL;
  }
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/folktemp.cpp b/engines/avalanche/folktemp.cpp
index 6d9fe754df..4745d959d0 100644
--- a/engines/avalanche/folktemp.cpp
+++ b/engines/avalanche/folktemp.cpp
@@ -28,6 +28,7 @@
 /* Get 'em back! */
 #include "graph.h"
 
+namespace Avalanche {
 
 const integer picsize = 966;
 const integer number_of_objects = 19;
@@ -102,3 +103,5 @@ int main(int argc, const char* argv[])
  close(f); freemem(p,picsize);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/fontslid.cpp b/engines/avalanche/fontslid.cpp
index 0d2a412544..8955546b03 100644
--- a/engines/avalanche/fontslid.cpp
+++ b/engines/avalanche/fontslid.cpp
@@ -27,6 +27,8 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 typedef matrix<'\0','\377',0,15,byte> fonttype;
 
 fonttype font1;
@@ -46,4 +48,6 @@ int main(int argc, const char* argv[])
  }
  assign(f,"v:avitalic.fnt"); rewrite(f); f << font1; close(f);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/frere.cpp b/engines/avalanche/frere.cpp
index 574fc8d85d..ddd622cb9a 100644
--- a/engines/avalanche/frere.cpp
+++ b/engines/avalanche/frere.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 typedef array<1,31,byte> tunetype;
 
@@ -123,4 +124,6 @@ int main(int argc, const char* argv[])
 
  output << "*** PROGRAM STOPPED! ***" << NL;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/g-room.cpp b/engines/avalanche/g-room.cpp
index b8dab2838d..c1e81e0525 100644
--- a/engines/avalanche/g-room.cpp
+++ b/engines/avalanche/g-room.cpp
@@ -30,6 +30,8 @@
 
 /*$R+*/
 
+namespace Avalanche {
+
 const array<1,5,shortint> adjustment = {{7,0,7,7,7}};
 
 const array<0,3,byte> plane_to_use = {{2,2,2,3}};
@@ -435,3 +437,5 @@ int main(int argc, const char* argv[])
  closegraph();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/golden.cpp b/engines/avalanche/golden.cpp
index e5ad0d6fde..ec20034f15 100644
--- a/engines/avalanche/golden.cpp
+++ b/engines/avalanche/golden.cpp
@@ -28,6 +28,7 @@
 /*$I c:\sleep5\DSMI.INC*/ #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const varying_string<255> song = 
 string("Golden slumbers kiss your eyes/Smiles awake you when you rise/")+
@@ -459,3 +460,5 @@ int main(int argc, const char* argv[])
   for( gd=320; gd >= 0; gd --) rectangle(320-gd,100-gd / 2,320+gd,100+gd / 2);
   return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/gyro.cpp b/engines/avalanche/gyro.cpp
index f4f82bb2c6..651c55b1f3 100644
--- a/engines/avalanche/gyro.cpp
+++ b/engines/avalanche/gyro.cpp
@@ -47,6 +47,7 @@
 #include "dropdown.h"
 #include "basher.h"
 
+namespace Avalanche {
 
 const array<'\1',numobjs,varying_string<15> > things = 
  {{"Wine","Money-bag","Bodkin","Potion","Chastity belt",
@@ -554,4 +555,4 @@ void super_on()
  if (super_was_virtual)  on_virtual(); else on();
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/gyro.h b/engines/avalanche/gyro.h
index 22b8552e47..22d7544dab 100644
--- a/engines/avalanche/gyro.h
+++ b/engines/avalanche/gyro.h
@@ -33,6 +33,7 @@
 /*#include "Dos.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const char numobjs = '\22'; /* always preface with a # */
 const integer maxobjs = 12;  /* carry limit */
@@ -726,4 +727,6 @@ EXTERN word cxmin,cxmax,cymin,cymax; EXTERN boolean use_joy_a;
 
  boolean mouse_near_text();
 
-#endif
+ } // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/help.cpp b/engines/avalanche/help.cpp
index c53e4d8999..70f7582ede 100644
--- a/engines/avalanche/help.cpp
+++ b/engines/avalanche/help.cpp
@@ -29,6 +29,8 @@
 /*#include "Rodent.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 typedef graphcursmasktype cursor;
 const char vernum[] = "v1ù00";
 const char copyright[] = "1992";
@@ -246,4 +248,6 @@ int main(int argc, const char* argv[])
   }
  } while (!lmo);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/help2.cpp b/engines/avalanche/help2.cpp
index fe9cbec76d..1fc41b6e48 100644
--- a/engines/avalanche/help2.cpp
+++ b/engines/avalanche/help2.cpp
@@ -28,6 +28,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 typedef matrix<'\0','\377',0,15,byte> fonttype;
 
 struct hypertype {
@@ -266,3 +268,5 @@ int main(int argc, const char* argv[])
  } while (!false);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/helpbak.cpp b/engines/avalanche/helpbak.cpp
index 1a7138b3ce..b5513f3be6 100644
--- a/engines/avalanche/helpbak.cpp
+++ b/engines/avalanche/helpbak.cpp
@@ -41,6 +41,7 @@
 /*#include "Crt.h"*/
 /*#include "Lucerna.h"*/
 
+namespace Avalanche {
 
 struct buttontype {
              char trigger;
@@ -184,3 +185,4 @@ void boot_help()
  dawn;
 }
 
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/helpbak.h b/engines/avalanche/helpbak.h
index 3d8f5d8283..4025aa882d 100644
--- a/engines/avalanche/helpbak.h
+++ b/engines/avalanche/helpbak.h
@@ -32,7 +32,10 @@
 #include "graph.h"
 /*#include "Gyro.h"*/
 
+namespace Avalanche {
 
 void boot_help();
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/helper.cpp b/engines/avalanche/helper.cpp
index ad489a8669..397c63fd7f 100644
--- a/engines/avalanche/helper.cpp
+++ b/engines/avalanche/helper.cpp
@@ -42,6 +42,7 @@
 /*#include "Lucerna.h"*/
 /*#include "Pingo.h"*/
 
+namespace Avalanche {
 
 struct buttontype {
              char trigger;
@@ -305,3 +306,4 @@ void boot_help()
  setactivepage(1-cp);
 }
 
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/helper.h b/engines/avalanche/helper.h
index 22c6b06573..bc4afbd54b 100644
--- a/engines/avalanche/helper.h
+++ b/engines/avalanche/helper.h
@@ -28,6 +28,7 @@
 #ifndef __helper_h__
 #define __helper_h__
 
+namespace Avalanche {
 
 #include "graph.h"
 /*#include "Gyro.h"*/
@@ -35,4 +36,6 @@
 
 void boot_help();
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/hibits.cpp b/engines/avalanche/hibits.cpp
index dc3d0ab766..fbdc662911 100644
--- a/engines/avalanche/hibits.cpp
+++ b/engines/avalanche/hibits.cpp
@@ -25,6 +25,8 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
+namespace Avalanche {
+
 file<char> inf,outf;
 char x;
 string q;
@@ -48,4 +50,6 @@ int main(int argc, const char* argv[])
  }
  close(inf); close(outf);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/highs.cpp b/engines/avalanche/highs.cpp
index 419eb38e2b..bb4909b067 100644
--- a/engines/avalanche/highs.cpp
+++ b/engines/avalanche/highs.cpp
@@ -41,6 +41,7 @@
 /*#include "Gyro.h"*/
 /*#include "Scrolls.h"*/
 
+namespace Avalanche {
 
 typedef array<1,12,struct A1 {
                                  varying_string<30> name;
@@ -138,4 +139,6 @@ static unit_highs_initialize highs_constructor;
 
 unit_highs_initialize::unit_highs_initialize() {;
  get_highs();
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/highs.h b/engines/avalanche/highs.h
index f147c05985..a4937cbab4 100644
--- a/engines/avalanche/highs.h
+++ b/engines/avalanche/highs.h
@@ -28,9 +28,12 @@
 #ifndef __highs_h__
 #define __highs_h__
 
+namespace Avalanche {
 
   void show_highs();
 
   void store_high(string who);
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/hiz.cpp b/engines/avalanche/hiz.cpp
index cb0a6271cc..f5f106ea0b 100644
--- a/engines/avalanche/hiz.cpp
+++ b/engines/avalanche/hiz.cpp
@@ -32,6 +32,7 @@
 /*#include "Dos.h"*/
 /*#include "Tsru.h"*/
 
+namespace Avalanche {
 
     /* program's signature */
 const varying_string<20> tsr_tmark = "FISH FISH FISH!!!";
@@ -309,3 +310,5 @@ int main(int argc, const char* argv[])
  keep(0);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/incline.cpp b/engines/avalanche/incline.cpp
index f6d79266ca..32dad74874 100644
--- a/engines/avalanche/incline.cpp
+++ b/engines/avalanche/incline.cpp
@@ -40,6 +40,7 @@
 #include "gyro.h"
 #include "logger.h"
 
+namespace Avalanche {
 
 byte fv;
 char t;
@@ -195,3 +196,5 @@ unit_incline_initialize::unit_incline_initialize() {
 
  check_slope_line();
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/initxf.cpp b/engines/avalanche/initxf.cpp
index 342f3ef51d..e6ebcfb9f7 100644
--- a/engines/avalanche/initxf.cpp
+++ b/engines/avalanche/initxf.cpp
@@ -27,6 +27,8 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 struct inirex {
           varying_string<12> a;
           word num;
@@ -53,4 +55,6 @@ int main(int argc, const char* argv[])
  close(i); close(o);
  output << NL;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/inputtes.cpp b/engines/avalanche/inputtes.cpp
index 4400fa5494..c24a933ed1 100644
--- a/engines/avalanche/inputtes.cpp
+++ b/engines/avalanche/inputtes.cpp
@@ -28,6 +28,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 typedef matrix<'\0','\377',0,15,byte> fonttype;
 
 integer gd,gm;
@@ -69,3 +71,5 @@ int main(int argc, const char* argv[])
  } while (!false);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/intro.cpp b/engines/avalanche/intro.cpp
index 854db43df0..010e024b94 100644
--- a/engines/avalanche/intro.cpp
+++ b/engines/avalanche/intro.cpp
@@ -30,6 +30,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
  /* This is a stand-alone program. */
 
 /* 0, black, remains 0.
@@ -618,3 +620,5 @@ int main(int argc, const char* argv[])
  graphmode(3);
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/ints.cpp b/engines/avalanche/ints.cpp
index 0d966883a1..a14ee55618 100644
--- a/engines/avalanche/ints.cpp
+++ b/engines/avalanche/ints.cpp
@@ -28,6 +28,8 @@
 /* Avalot interrupt handler */
 /*#include "Dos.h"*/
 
+namespace Avalanche {
+
 /*$F+*/
 registers r;
 void() old1b;
@@ -52,3 +54,5 @@ int main(int argc, const char* argv[])
  until false;*/
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/joysetup.cpp b/engines/avalanche/joysetup.cpp
index 4326ac8b31..1ebbc4fb66 100644
--- a/engines/avalanche/joysetup.cpp
+++ b/engines/avalanche/joysetup.cpp
@@ -30,6 +30,7 @@
 /*#include "Joystick.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 struct joysetup {
             word xmid,ymid,xmin,ymin,xmax,ymax;
@@ -119,4 +120,6 @@ int main(int argc, const char* argv[])
  assign(jf,"v:joytmp.dat");
  rewrite(jf); jf << js; close(jf);     /* write it all out to disk. */
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/joystick.cpp b/engines/avalanche/joystick.cpp
index b18fdd04fc..8ebea36325 100644
--- a/engines/avalanche/joystick.cpp
+++ b/engines/avalanche/joystick.cpp
@@ -27,7 +27,6 @@
 
 #define __joystick_implementation__
 
-
 /*
 Copyright (c) 1989, 1990 David B. Howorth
 
@@ -60,6 +59,7 @@ Hill Road, Portland, Oregon 97219.
 
 /*#include "Dos.h"*/
 
+namespace Avalanche {
 
 typedef void(*readjoyproc)(byte a,byte b,word& c,word& d);
 typedef boolean(*buttonfunc)(byte a);
@@ -206,3 +206,5 @@ unit_joystick_initialize::unit_joystick_initialize() {
            button = oldbutton;
          }
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/joystick.h b/engines/avalanche/joystick.h
index 8a1bcf1edb..2cbcd3c455 100644
--- a/engines/avalanche/joystick.h
+++ b/engines/avalanche/joystick.h
@@ -28,6 +28,7 @@
 #ifndef __joystick_h__
 #define __joystick_h__
 
+namespace Avalanche {
 
 void readjoya(word& xaxis, word& yaxis);
 /* Reads the X and Y coordinates of Joystick A. */
@@ -46,4 +47,6 @@ boolean buttonb2();
 boolean joystickpresent();
 /* This function indicates whether a joystick is installed. */
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/loading.cpp b/engines/avalanche/loading.cpp
index a53e3edbd7..3f161eda8b 100644
--- a/engines/avalanche/loading.cpp
+++ b/engines/avalanche/loading.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 byte a /*absolute $A000:1200*/;
 byte bit;
@@ -45,3 +47,5 @@ int main(int argc, const char* argv[])
  close(f);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/logger.cpp b/engines/avalanche/logger.cpp
index 4d14e3cbe8..7da976d45c 100644
--- a/engines/avalanche/logger.cpp
+++ b/engines/avalanche/logger.cpp
@@ -41,6 +41,7 @@
 /*#include "Gyro.h"*/
 /*#include "Trip5.h"*/
 
+namespace Avalanche {
 
 const char divide[] = "--- oOo ---";
 
@@ -232,4 +233,4 @@ void log_score(word credit,word now)
  output << logfile << "Score " << italic << "credit : " << credit << italic_off << " total : " << now << NL;
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/logger.h b/engines/avalanche/logger.h
index b068f202ec..94cd9383b0 100644
--- a/engines/avalanche/logger.h
+++ b/engines/avalanche/logger.h
@@ -28,6 +28,7 @@
 #ifndef __logger_h__
 #define __logger_h__
 
+namespace Avalanche {
 
 void log_setup(string name, boolean printing);
 
@@ -57,4 +58,6 @@ void log_aside(string what);
 
 void log_score(word credit,word now);
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp
index 9ef67fdb7d..19466f4b3f 100644
--- a/engines/avalanche/lucerna.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -54,6 +54,7 @@
 #include "basher.h"
 #include "sequence.h"
 
+namespace Avalanche {
 
 /*$V-*/ /*$S-*/
 boolean fxhidden; array<0,3,palettetype> fxpal;
@@ -1512,3 +1513,5 @@ unit_lucerna_initialize::unit_lucerna_initialize() {
  fxhidden=false; oh=17717; om=17717;
  if (atbios)  atkey="f1"; else atkey="alt-";
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/lucerna.h b/engines/avalanche/lucerna.h
index f40364a2ba..5bf0782a8e 100644
--- a/engines/avalanche/lucerna.h
+++ b/engines/avalanche/lucerna.h
@@ -28,6 +28,7 @@
 #ifndef __lucerna_h__
 #define __lucerna_h__
 
+namespace Avalanche {
 
 #include "gyro.h"
 
@@ -100,4 +101,6 @@
 
  void fix_flashers();
 
-#endif
+ } // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/magic2.cpp b/engines/avalanche/magic2.cpp
index e1729f7ad2..130e188092 100644
--- a/engines/avalanche/magic2.cpp
+++ b/engines/avalanche/magic2.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 const longint pagetop = 81920;
 const word nextcode = 17717;
@@ -59,3 +60,5 @@ int main(int argc, const char* argv[])
  close(magic); close(out);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/magidraw.cpp b/engines/avalanche/magidraw.cpp
index 139f216f84..241f69265b 100644
--- a/engines/avalanche/magidraw.cpp
+++ b/engines/avalanche/magidraw.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const word nextcode = 17717;
 
@@ -56,3 +57,5 @@ int main(int argc, const char* argv[])
 /* close(magic);*/
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/magishuf.cpp b/engines/avalanche/magishuf.cpp
index 0fdb82930a..6706ceb56f 100644
--- a/engines/avalanche/magishuf.cpp
+++ b/engines/avalanche/magishuf.cpp
@@ -28,6 +28,7 @@
 /*#include "Dos.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const word nextcode = 17717;
 
@@ -82,3 +83,5 @@ int main(int argc, const char* argv[])
  } while (!keypressed());
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/make!.cpp b/engines/avalanche/make!.cpp
index 32d8a6c9b9..353b461387 100644
--- a/engines/avalanche/make!.cpp
+++ b/engines/avalanche/make!.cpp
@@ -28,6 +28,8 @@
 /* Phew! */
 #include "graph.h"
 
+namespace Avalanche {
+
 /*$S-*/
 integer gd,gm;
 untyped_file f;
@@ -85,3 +87,5 @@ int main(int argc, const char* argv[])
  close(t);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/makeregi.cpp b/engines/avalanche/makeregi.cpp
index 89b66d73eb..35b37d227f 100644
--- a/engines/avalanche/makeregi.cpp
+++ b/engines/avalanche/makeregi.cpp
@@ -27,6 +27,8 @@
 
 /* regname's name starts at $7D1 (2001). */
 
+namespace Avalanche {
+
 const array<1,56,char> padding = 
 "For all the Etruscan armies were ranged beneath his eye";
 
@@ -164,4 +166,6 @@ int main(int argc, const char* argv[])
 
  close(txi); close(txo);
  return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/makesez.cpp b/engines/avalanche/makesez.cpp
index cfb9974667..3c46e18e46 100644
--- a/engines/avalanche/makesez.cpp
+++ b/engines/avalanche/makesez.cpp
@@ -25,6 +25,8 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
+namespace Avalanche {
+
 struct sezheader {
              array<1,2,char> initials;     /* should be "TT" */
              word gamecode;
@@ -67,4 +69,7 @@ int main(int argc, const char* argv[])
  blockwrite(sez,x[1],39); /* footer */
  close(sez);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/makevmou.cpp b/engines/avalanche/makevmou.cpp
index 7d3c5f3912..9f509f16c6 100644
--- a/engines/avalanche/makevmou.cpp
+++ b/engines/avalanche/makevmou.cpp
@@ -30,6 +30,7 @@
 /*#include "Crt.h"*/
 
 /*$R+*/
+namespace Avalanche {
 
 struct mp { /* mouse-pointer */
       matrix<0,1,0,15,word> mask;
@@ -292,3 +293,5 @@ int main(int argc, const char* argv[])
  show_off_mouse;*/
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/menuxf.cpp b/engines/avalanche/menuxf.cpp
index be0920e07d..17fa553afe 100644
--- a/engines/avalanche/menuxf.cpp
+++ b/engines/avalanche/menuxf.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 
 void load()     /* Load2, actually */
@@ -70,3 +72,5 @@ int main(int argc, const char* argv[])
  save();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/minstran.cpp b/engines/avalanche/minstran.cpp
index d404c60bf7..38608c8ca0 100644
--- a/engines/avalanche/minstran.cpp
+++ b/engines/avalanche/minstran.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 pointer p; word s;
 
@@ -59,3 +61,5 @@ int main(int argc, const char* argv[])
  putimage(fx1+100,fy1,p,0); freemem(p,s);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/newsprit.cpp b/engines/avalanche/newsprit.cpp
index 095fc407a7..e18c0bea40 100644
--- a/engines/avalanche/newsprit.cpp
+++ b/engines/avalanche/newsprit.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const string crlf = string('\15')+'\12'; const char eof_ = '\32';
 const array<1,177,char> trip5head = 
@@ -145,4 +146,6 @@ int main(int argc, const char* argv[])
  blockwrite(out,trip5foot,50);
  close(out);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp
index a81dfc6720..86dd2b2a9d 100644
--- a/engines/avalanche/nim.cpp
+++ b/engines/avalanche/nim.cpp
@@ -29,6 +29,7 @@
 /*#include "Crt.h"*/
 /*#include "Dos.h"*/
 
+namespace Avalanche {
 
 const array<false,true,varying_string<7> > names = {{"Avalot","Dogfood"}};
 
@@ -403,3 +404,5 @@ int main(int argc, const char* argv[])
  endofgame(); /* Winning sequence is A1, B3, B1, C1, C1, btw. */
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/nimdraw.cpp b/engines/avalanche/nimdraw.cpp
index 45b1c6813d..a81d69fd24 100644
--- a/engines/avalanche/nimdraw.cpp
+++ b/engines/avalanche/nimdraw.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 const string header = string("Datafile for Avalot, copyright (c) 1992.")+'\32';
 
@@ -116,3 +117,5 @@ int main(int argc, const char* argv[])
  close(f);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/nimunit.cpp b/engines/avalanche/nimunit.cpp
index e2d5f6f45a..cfec877c33 100644
--- a/engines/avalanche/nimunit.cpp
+++ b/engines/avalanche/nimunit.cpp
@@ -37,6 +37,7 @@
 
 #include "nimunit.h"
 
+namespace Avalanche {
 
 const array<false,true,varying_string<7> > names = {{"Avalot","Dogfood"}};
 
@@ -466,3 +467,5 @@ void play_nim()     /* Plays the game. Only procedure in this unit to
 }
 
      /* No init part. */
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/nimunit.h b/engines/avalanche/nimunit.h
index 4b5f79b89e..8919b1af3a 100644
--- a/engines/avalanche/nimunit.h
+++ b/engines/avalanche/nimunit.h
@@ -28,7 +28,6 @@
 #ifndef __nimunit_h__
 #define __nimunit_h__
 
-
 #include "gyro.h"
   #include "Graph.h"
   /*#include "Crt.h"*/
@@ -38,8 +37,10 @@
 #include "logger.h"
 #include "celer.h"
 
+namespace Avalanche {
 
   void play_nim();
 
+} // End of namespace Avalanche.
 
 #endif
diff --git a/engines/avalanche/oldfiler.cpp b/engines/avalanche/oldfiler.cpp
index f8020269ab..c813f37648 100644
--- a/engines/avalanche/oldfiler.cpp
+++ b/engines/avalanche/oldfiler.cpp
@@ -31,6 +31,7 @@
 /*#include "Rodent.h"*/
 
 /*$V-*/
+namespace Avalanche {
 
 const char more[] = " (more) ";
 const string up = string('-')+'\30'+more+'\30';
@@ -280,5 +281,4 @@ int main(int argc, const char* argv[])
 return EXIT_SUCCESS;
 }
 
-
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/oldhighs.cpp b/engines/avalanche/oldhighs.cpp
index 5fa205cb4f..eaee8eb502 100644
--- a/engines/avalanche/oldhighs.cpp
+++ b/engines/avalanche/oldhighs.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 struct scoretype {
              varying_string<39> name;
@@ -270,4 +271,6 @@ int main(int argc, const char* argv[])
  newtable();
  newscore(/*177*/0);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/oldincln.cpp b/engines/avalanche/oldincln.cpp
index c627407daf..a364cbcfdd 100644
--- a/engines/avalanche/oldincln.cpp
+++ b/engines/avalanche/oldincln.cpp
@@ -40,6 +40,7 @@
 #include "gyro.h"
 #include "logger.h"
 
+namespace Avalanche {
 
 const integer bug_twonames = 255;
 const integer bug_pandl = 254;
@@ -272,3 +273,5 @@ unit_incline_initialize::unit_incline_initialize() {;
  for( fv=4; fv <= paramcount; fv ++)
   parse(paramstr(fv));
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/oldtrip.cpp b/engines/avalanche/oldtrip.cpp
index e7df00fd68..9a3476e82d 100644
--- a/engines/avalanche/oldtrip.cpp
+++ b/engines/avalanche/oldtrip.cpp
@@ -42,6 +42,7 @@
 /*#include "Gyro.h"*/
 /*#include "Dropdown.h"*/
 
+namespace Avalanche {
 
 void copier(integer x1,integer y1,integer x2,integer y2,integer x3,integer y3,integer x4,integer y4);
 
@@ -471,3 +472,4 @@ boolean neardoor_result;
 return neardoor_result;
 }
 
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/oldtrip.h b/engines/avalanche/oldtrip.h
index 7a5e40238a..70782ee7da 100644
--- a/engines/avalanche/oldtrip.h
+++ b/engines/avalanche/oldtrip.h
@@ -32,6 +32,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const integer maxgetset = 10;
 
@@ -118,5 +119,6 @@ EXTERN array<1,numtr,triptype> tr;
 #undef EXTERN
 #define EXTERN extern
 
+} // End of namespace Avalanche.
 
-#endif
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/omtest.cpp b/engines/avalanche/omtest.cpp
index 0209619c18..c102b3f0ec 100644
--- a/engines/avalanche/omtest.cpp
+++ b/engines/avalanche/omtest.cpp
@@ -31,6 +31,8 @@
 /*#include "Crt.h"*/
 /*#include "Enhanced.h"*/
 
+namespace Avalanche {
+
 varying_string<5> st;
 byte fv;
 
@@ -198,4 +200,6 @@ int main(int argc, const char* argv[])
   }
  } while (!false);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/oopmenu.cpp b/engines/avalanche/oopmenu.cpp
index 9f8445b7f7..2d8ae42d84 100644
--- a/engines/avalanche/oopmenu.cpp
+++ b/engines/avalanche/oopmenu.cpp
@@ -36,6 +36,7 @@
 /*#include "Rodent.h"*/
 /*#include "Dos.h"*/
 
+namespace Avalanche {
 
 const integer indent = 40;
 const integer spacing = 83;
@@ -318,3 +319,4 @@ void parsekey(char r,char re)
   }
 }
 
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/oopmenu.h b/engines/avalanche/oopmenu.h
index 4ac4efb1eb..32f171e824 100644
--- a/engines/avalanche/oopmenu.h
+++ b/engines/avalanche/oopmenu.h
@@ -28,6 +28,7 @@
 #ifndef __oopmenu_h__
 #define __oopmenu_h__
 
+namespace Avalanche {
 
 typedef void(*proc)();
 
@@ -106,4 +107,6 @@ EXTERN string kbuffer;
 
   void parsekey(char r,char re);
 
+} // End of namespace Avalanche.
+
 #endif
diff --git a/engines/avalanche/overlap.cpp b/engines/avalanche/overlap.cpp
index d68a292d58..14d5dc8a17 100644
--- a/engines/avalanche/overlap.cpp
+++ b/engines/avalanche/overlap.cpp
@@ -28,6 +28,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 
 void flash(integer x1,integer y1,integer x2,integer y2)
@@ -74,4 +76,6 @@ int main(int argc, const char* argv[])
  test(100,50,200,100,120, 70,220,120);
  test(100,50,200,100,150, 50,250,100);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/overscro.cpp b/engines/avalanche/overscro.cpp
index 307b9e2833..9617e2efb4 100644
--- a/engines/avalanche/overscro.cpp
+++ b/engines/avalanche/overscro.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 int main(int argc, const char* argv[])
 {pio_initialize(argc, argv);
@@ -75,3 +77,5 @@ int main(int argc, const char* argv[])
  end;*/
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/particle.cpp b/engines/avalanche/particle.cpp
index ef1141e3ae..bcccdb9bb8 100644
--- a/engines/avalanche/particle.cpp
+++ b/engines/avalanche/particle.cpp
@@ -30,6 +30,8 @@
 
 /*$R+*/
 
+namespace Avalanche {
+
 typedef matrix<'\0','\377',0,15,byte> fonttype;
 
 struct markertype {
@@ -255,3 +257,5 @@ int main(int argc, const char* argv[])
  } while (!ok);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/pictemp.cpp b/engines/avalanche/pictemp.cpp
index c2a05aee4f..cbc8474828 100644
--- a/engines/avalanche/pictemp.cpp
+++ b/engines/avalanche/pictemp.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 const integer picsize = 966;
 
@@ -87,3 +88,5 @@ int main(int argc, const char* argv[])
  save();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/pictemp2.cpp b/engines/avalanche/pictemp2.cpp
index 39087b1741..f0ebccde03 100644
--- a/engines/avalanche/pictemp2.cpp
+++ b/engines/avalanche/pictemp2.cpp
@@ -28,6 +28,7 @@
 /* Get 'em back! */
 #include "graph.h"
 
+namespace Avalanche {
 
 const integer picsize = 966;
 const integer number_of_objects = 17;
@@ -87,3 +88,5 @@ int main(int argc, const char* argv[])
  close(f); freemem(p,picsize);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/pingo.cpp b/engines/avalanche/pingo.cpp
index 6b0f4902cf..2c68a8c3a9 100644
--- a/engines/avalanche/pingo.cpp
+++ b/engines/avalanche/pingo.cpp
@@ -45,6 +45,7 @@
 #include "trip5.h"
 #include "scrolls.h"
 
+namespace Avalanche {
 
 void dplot(integer x,integer y, string z)
 {;
@@ -251,4 +252,4 @@ void winning_pic()
  major_redraw();
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/pingo.h b/engines/avalanche/pingo.h
index 71af98e0ea..2bda4780c7 100644
--- a/engines/avalanche/pingo.h
+++ b/engines/avalanche/pingo.h
@@ -28,6 +28,7 @@
 #ifndef __pingo_h__
 #define __pingo_h__
 
+namespace Avalanche {
 
 void bosskey();
 
@@ -43,4 +44,6 @@ void zonk();
 
 void winning_pic();
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/plottest.cpp b/engines/avalanche/plottest.cpp
index 799f1f1adb..909088c0e5 100644
--- a/engines/avalanche/plottest.cpp
+++ b/engines/avalanche/plottest.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm; byte fv;
 matrix<1,35,0,39,byte> a;
 array<0,3,0,4,1,35,byte> b;
@@ -64,3 +66,5 @@ int main(int argc, const char* argv[])
   }
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/preview1.cpp b/engines/avalanche/preview1.cpp
index f76486da9c..861127714b 100644
--- a/engines/avalanche/preview1.cpp
+++ b/engines/avalanche/preview1.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 array<0,3,palettetype> fxpal;
 
@@ -144,3 +145,5 @@ int main(int argc, const char* argv[])
  closegraph();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/qintro.cpp b/engines/avalanche/qintro.cpp
index b3e2eb60de..22e6f3f1b8 100644
--- a/engines/avalanche/qintro.cpp
+++ b/engines/avalanche/qintro.cpp
@@ -29,6 +29,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
  /* This is a stand-alone program. */
 
 /* 0, black, remains 0.
@@ -299,3 +301,5 @@ int main(int argc, const char* argv[])
  graphmode(3);
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/qstars.cpp b/engines/avalanche/qstars.cpp
index 2ed399dcc4..d512838121 100644
--- a/engines/avalanche/qstars.cpp
+++ b/engines/avalanche/qstars.cpp
@@ -31,6 +31,8 @@
 /*#include "Rodent.h"*/
 /*#include "Tommys.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 
 typedef matrix<'\0','\377',0,15,byte> fonttype;
@@ -260,3 +262,5 @@ int main(int argc, const char* argv[])
  bigo2go();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/rawupd.cpp b/engines/avalanche/rawupd.cpp
index 6d8a3005b8..4f2a5f7b36 100644
--- a/engines/avalanche/rawupd.cpp
+++ b/engines/avalanche/rawupd.cpp
@@ -28,6 +28,8 @@
 /*#include "Dos.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 searchrec s;
 string x,y;
 longint hash_time,s_time;
@@ -92,4 +94,6 @@ int main(int argc, const char* argv[])
   findnext(s);
  }
  return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/readsez.cpp b/engines/avalanche/readsez.cpp
index 76cfc77d6e..b55d45ab3b 100644
--- a/engines/avalanche/readsez.cpp
+++ b/engines/avalanche/readsez.cpp
@@ -25,6 +25,8 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
+namespace Avalanche {
+
 struct markertype {
               word length;
               longint offset;
@@ -100,4 +102,6 @@ int main(int argc, const char* argv[])
  }
  close(f);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/reginam.cpp b/engines/avalanche/reginam.cpp
index 7a2cbac0cb..0458acb337 100644
--- a/engines/avalanche/reginam.cpp
+++ b/engines/avalanche/reginam.cpp
@@ -25,6 +25,8 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
+namespace Avalanche {
+
 const array<1,36,char> letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 varying_string<30> name;
 varying_string<5> number;
@@ -112,4 +114,6 @@ int main(int argc, const char* argv[])
  negate();
  output << "Or, negated, = " << name << NL;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sackb1.cpp b/engines/avalanche/sackb1.cpp
index cc11935270..e3369db8c7 100644
--- a/engines/avalanche/sackb1.cpp
+++ b/engines/avalanche/sackb1.cpp
@@ -45,6 +45,8 @@
 /*$L v:MOD-obj.OBJ*/ 	        /* Link in Object file */
 /*$F+*/ 				/* force calls to be 'far'*/
 
+namespace Avalanche {
+
 extern void modvolume(integer v1,integer v2,integer v3,integer v4);  /*Can do while playing*/
 extern void moddevice(integer& device); 
 extern void modsetup(integer& status,integer device,integer mixspeed,integer pro,integer loop,string& stri); 
@@ -74,4 +76,4 @@ void sb_link()     /* At the moment, this does nothing. */
 {;
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sackb1.h b/engines/avalanche/sackb1.h
index e226946560..c660c36117 100644
--- a/engines/avalanche/sackb1.h
+++ b/engines/avalanche/sackb1.h
@@ -31,6 +31,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 void sb_start(string md);
 
@@ -38,4 +39,6 @@ void sb_stop();
 
 void sb_link();    /* At the moment, this does nothing. */
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/sackb3.cpp b/engines/avalanche/sackb3.cpp
index 60a259c1f4..0abca98d17 100644
--- a/engines/avalanche/sackb3.cpp
+++ b/engines/avalanche/sackb3.cpp
@@ -32,6 +32,7 @@
 
 /*#include "SBVoice.h"*/
 
+namespace Avalanche {
 
 int main(int argc, const char* argv[])
 {
@@ -46,3 +47,5 @@ if (paramcount>0)  {
     output << "Usage: DEMO [d:\\path\\]filename.voc" << NL;
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sackblas.cpp b/engines/avalanche/sackblas.cpp
index e3261d7c1e..9cec14da29 100644
--- a/engines/avalanche/sackblas.cpp
+++ b/engines/avalanche/sackblas.cpp
@@ -23,5 +23,4 @@
 /*
  * This code is based on the original source code of Lord Avalot d'Argent version 1.3.
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
- */
-
+ */
\ No newline at end of file
diff --git a/engines/avalanche/saving.cpp b/engines/avalanche/saving.cpp
index fce157e440..5385a6c28f 100644
--- a/engines/avalanche/saving.cpp
+++ b/engines/avalanche/saving.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 byte a /*absolute $A000:(15*80)*/;
 byte bit;
@@ -70,3 +72,5 @@ int main(int argc, const char* argv[])
  close(f);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scr_1.cpp b/engines/avalanche/scr_1.cpp
index 5a9d55d330..6228bf86f5 100644
--- a/engines/avalanche/scr_1.cpp
+++ b/engines/avalanche/scr_1.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const varying_string<4> codes = " ßÜÛ";
 
@@ -111,3 +112,5 @@ int main(int argc, const char* argv[])
  save();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scr_2.cpp b/engines/avalanche/scr_2.cpp
index 2d5a78c8dd..6cb6fca6e9 100644
--- a/engines/avalanche/scr_2.cpp
+++ b/engines/avalanche/scr_2.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const varying_string<4> codes = " ßÜÛ";
 
@@ -135,3 +136,5 @@ int main(int argc, const char* argv[])
  save();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scr_3.cpp b/engines/avalanche/scr_3.cpp
index 0e4ff0dbf2..b71353c9e0 100644
--- a/engines/avalanche/scr_3.cpp
+++ b/engines/avalanche/scr_3.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const varying_string<4> codes = " ßÜÛ";
 
@@ -115,3 +116,5 @@ int main(int argc, const char* argv[])
  save();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scr_4.cpp b/engines/avalanche/scr_4.cpp
index 44099e171e..7f5cb6ada0 100644
--- a/engines/avalanche/scr_4.cpp
+++ b/engines/avalanche/scr_4.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const varying_string<4> codes = " ÞÝÛ";
 
@@ -110,4 +111,6 @@ int main(int argc, const char* argv[])
  textattr=30; centre(12,"Well done!");
  textattr=27; centre(14,"You completed the game!");
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scr_5.cpp b/engines/avalanche/scr_5.cpp
index 82686317f5..5a4aa12b22 100644
--- a/engines/avalanche/scr_5.cpp
+++ b/engines/avalanche/scr_5.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const varying_string<4> codes = " ßÜÛ";
 
@@ -115,3 +116,5 @@ int main(int argc, const char* argv[])
  save();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scr_9.cpp b/engines/avalanche/scr_9.cpp
index 2dac08ca39..1fb494257e 100644
--- a/engines/avalanche/scr_9.cpp
+++ b/engines/avalanche/scr_9.cpp
@@ -27,6 +27,8 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 text t;
 string x;
 byte fv;
@@ -43,3 +45,5 @@ int main(int argc, const char* argv[])
  gotoxy(1,23); clreol;
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp
index 7bf6c6de05..c109624671 100644
--- a/engines/avalanche/scrolls.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -50,6 +50,7 @@
 #include "visa.h"
 #include "timeout.h"
 
+namespace Avalanche {
 
 const integer roman = 0;
 const integer italic = 1;
@@ -804,3 +805,5 @@ unit_scrolls_initialize::unit_scrolls_initialize() {
  loadfont();
  resetscrolldriver();
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/scrolls.h b/engines/avalanche/scrolls.h
index d20d3619de..a22cfb7c2e 100644
--- a/engines/avalanche/scrolls.h
+++ b/engines/avalanche/scrolls.h
@@ -32,6 +32,7 @@
 #include "gyro.h"
 #include "joystick.h"
 
+namespace Avalanche {
 
 const boolean aboutscroll = false; /* Is this the about box? */
 
@@ -57,4 +58,6 @@ void okay();    /* Says "Okay!" */
 
 void musical_scroll();
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/sequence.cpp b/engines/avalanche/sequence.cpp
index 243caf42b1..cf1cb0ae3f 100644
--- a/engines/avalanche/sequence.cpp
+++ b/engines/avalanche/sequence.cpp
@@ -43,6 +43,7 @@
 /*#include "Celer.h"*/
 /*#include "Trip5.h"*/
 
+namespace Avalanche {
 
 void then_show(byte what)
 {
@@ -115,3 +116,4 @@ void call_sequencer()
  start_to_close(); /* Make sure this proc gets called again. */
 }
 
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sequence.h b/engines/avalanche/sequence.h
index 86d2d89d63..2d773ca181 100644
--- a/engines/avalanche/sequence.h
+++ b/engines/avalanche/sequence.h
@@ -28,6 +28,7 @@
 #ifndef __sequence_h__
 #define __sequence_h__
 
+namespace Avalanche {
 
 const integer now_flip = 177;
 
@@ -56,4 +57,6 @@ void start_to_open();
 
 void call_sequencer();
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/setup.cpp b/engines/avalanche/setup.cpp
index 1416a5128e..245a119bd6 100644
--- a/engines/avalanche/setup.cpp
+++ b/engines/avalanche/setup.cpp
@@ -29,6 +29,7 @@
 /*#include "Tommys.h"*/
 #include "joystick.h"
 
+namespace Avalanche {
 
 const integer selected = 0x60; /* Background for selected lines of text. */
 
@@ -1290,3 +1291,5 @@ int main(int argc, const char* argv[])
  clear_up();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/seu.cpp b/engines/avalanche/seu.cpp
index 9e8f4aaa47..883a810cdb 100644
--- a/engines/avalanche/seu.cpp
+++ b/engines/avalanche/seu.cpp
@@ -30,6 +30,7 @@
 /*#include "Crt.h"*/
 /*#include "Tommys.h"*/
 
+namespace Avalanche {
 
 const integer msize = 100;
 const integer flag = -20047;
@@ -999,3 +1000,5 @@ int main(int argc, const char* argv[])
  mem[storage_seg*storage_ofs]=score;
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/seu_avvy.cpp b/engines/avalanche/seu_avvy.cpp
index 206c844c55..479f8c174a 100644
--- a/engines/avalanche/seu_avvy.cpp
+++ b/engines/avalanche/seu_avvy.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 struct adxtype {
            varying_string<12> name; /* name of character */
@@ -111,4 +112,6 @@ int main(int argc, const char* argv[])
  close(sf);
  close(outfile);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sezedit.cpp b/engines/avalanche/sezedit.cpp
index d9f0e484f9..4ec0bf37b0 100644
--- a/engines/avalanche/sezedit.cpp
+++ b/engines/avalanche/sezedit.cpp
@@ -29,6 +29,7 @@
 /*#include "Crt.h"*/
 #include "graph.h"
 
+namespace Avalanche {
 
 const char marker = '\33';
 const char game[] = "Avalot";
@@ -428,3 +429,5 @@ int main(int argc, const char* argv[])
  general();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sezunit.cpp b/engines/avalanche/sezunit.cpp
index c98e6f8367..e9dda13267 100644
--- a/engines/avalanche/sezunit.cpp
+++ b/engines/avalanche/sezunit.cpp
@@ -30,6 +30,7 @@
 
 #include "sezunit.h"
 
+namespace Avalanche {
 
 struct markertype {
               word length;
@@ -99,3 +100,4 @@ void getchain(longint number)
  sezerror=sezok;  /* nowt went wrong */
 }
 
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sezunit.h b/engines/avalanche/sezunit.h
index 76feb6665b..fa1f750b0a 100644
--- a/engines/avalanche/sezunit.h
+++ b/engines/avalanche/sezunit.h
@@ -31,6 +31,7 @@
 
 /*#include "Gyro.h"*/
 
+namespace Avalanche {
 
 struct sezheader {
              array<1,2,char> initials;     /* should be "TT" */
@@ -65,5 +66,6 @@ void sez_setup();
 
 void getchain(longint number);
 
+} // End of namespace Avalanche.
 
-#endif
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/sezxfr.cpp b/engines/avalanche/sezxfr.cpp
index 7ae6cec3d0..3c2cff62f5 100644
--- a/engines/avalanche/sezxfr.cpp
+++ b/engines/avalanche/sezxfr.cpp
@@ -27,6 +27,9 @@
 
 /*#include "Crt.h"*/
  /*$V-*/
+
+namespace Avalanche {
+
 text t;
 string x;
 matrix<1,100,1,2,string> data;
@@ -116,4 +119,6 @@ int main(int argc, const char* argv[])
 
  /* Done! */
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/shell1.cpp b/engines/avalanche/shell1.cpp
index 5d6e2c9e2d..1618174fe4 100644
--- a/engines/avalanche/shell1.cpp
+++ b/engines/avalanche/shell1.cpp
@@ -28,6 +28,8 @@
 /*$M $800,0,0*/
 /*#include "Dos.h"*/
 
+namespace Avalanche {
+
 struct infotype {
             matrix<128,255,1,8,byte> chars;
             string data;
@@ -57,4 +59,6 @@ int main(int argc, const char* argv[])
  swapvectors;
  setintvec(0x1f,where);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/shell2.cpp b/engines/avalanche/shell2.cpp
index cd6fec2d27..1bc68dfc1c 100644
--- a/engines/avalanche/shell2.cpp
+++ b/engines/avalanche/shell2.cpp
@@ -28,6 +28,8 @@
 /*#include "Dos.h"*/
 #include "graph.h"
 
+namespace Avalanche {
+
 struct infotype {
             matrix<128,255,1,8,byte> chars;
             string data;
@@ -47,4 +49,6 @@ int main(int argc, const char* argv[])
  output << "Press Enter..." << NL;
  input >> NL; closegraph();
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/slope.cpp b/engines/avalanche/slope.cpp
index 83bb1d7a8e..54ab3d0aa8 100644
--- a/engines/avalanche/slope.cpp
+++ b/engines/avalanche/slope.cpp
@@ -25,6 +25,8 @@
  * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
  */
 
+namespace Avalanche {
+
 struct joysetup {
             word xmid,ymid,xmin,ymin,xmax,ymax;
             byte centre; /* Size of centre in tenths */
@@ -370,3 +372,5 @@ int main(int argc, const char* argv[])
  store_slopeline();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/spread.cpp b/engines/avalanche/spread.cpp
index 3ee7134862..acc9535b64 100644
--- a/engines/avalanche/spread.cpp
+++ b/engines/avalanche/spread.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 struct adxtype {
            varying_string<12> name; /* name of character */
@@ -327,4 +328,6 @@ int main(int argc, const char* argv[])
   pickone();
  } while (!false);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/spread2.cpp b/engines/avalanche/spread2.cpp
index 5a42427d64..6fa215900e 100644
--- a/engines/avalanche/spread2.cpp
+++ b/engines/avalanche/spread2.cpp
@@ -31,6 +31,8 @@
 
 /*$V-,R+*/
 
+namespace Avalanche {
+
 const integer pattern = 12; /* Pattern for transparencies. */
 const fillpatterntype grey50 = {{0xaa, 0x55, 0xaa,
  0x55, 0xaa, 0x55, 0xaa, 0x55}};
@@ -876,4 +878,6 @@ int main(int argc, const char* argv[])
   }
  } while (!false);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/squish.cpp b/engines/avalanche/squish.cpp
index d9077ed29f..231aae2168 100644
--- a/engines/avalanche/squish.cpp
+++ b/engines/avalanche/squish.cpp
@@ -33,6 +33,8 @@
 /*                                                                          */
 /*--------------------------------------------------------------------------*/
 
+namespace Avalanche {
+
 const integer maxbuff = 8192    /* Buffer size for input and output files */;
 const integer maxtab = 4095     /* Table size - 1 ==> 2**10-1 ==> 12 bits */;
 const integer no_prev = 0x7fff  /* Special code for no previous character */;
@@ -476,3 +478,5 @@ int main(int argc, const char* argv[])
 
    return EXIT_SUCCESS;
 }     /* PibCompr */
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/ss_blank.cpp b/engines/avalanche/ss_blank.cpp
index 7e9765407c..907c09f91c 100644
--- a/engines/avalanche/ss_blank.cpp
+++ b/engines/avalanche/ss_blank.cpp
@@ -28,6 +28,8 @@
 /*#include "Dos.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 byte fv;
 boolean test;
 
@@ -59,4 +61,6 @@ int main(int argc, const char* argv[])
  output << NL;
  output << "Have fun!" << NL;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/ss_clock.cpp b/engines/avalanche/ss_clock.cpp
index ae466bc9cf..b73576506b 100644
--- a/engines/avalanche/ss_clock.cpp
+++ b/engines/avalanche/ss_clock.cpp
@@ -30,6 +30,7 @@
 #include "graph.h"
 /*#include "Drivers.h"*/
 
+namespace Avalanche {
 
 const integer width = 88;
 const integer height = 8; /* width & height of string returned by "time" */
@@ -105,4 +106,6 @@ int main(int argc, const char* argv[])
  output << NL;
  output << "Have fun!" << NL;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/stars.cpp b/engines/avalanche/stars.cpp
index d6bc8ef145..aaeada2a36 100644
--- a/engines/avalanche/stars.cpp
+++ b/engines/avalanche/stars.cpp
@@ -32,6 +32,8 @@
 /*#include "Rodent.h"*/
 /*#include "Tommys.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 
 typedef matrix<'\0','\377',0,15,byte> fonttype;
@@ -585,3 +587,5 @@ int main(int argc, const char* argv[])
  closegraph();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/status.cpp b/engines/avalanche/status.cpp
index c8931e6d22..f9c5ddb75b 100644
--- a/engines/avalanche/status.cpp
+++ b/engines/avalanche/status.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer gd,gm;
 
 void data(integer y, string a,string b)
@@ -55,4 +57,6 @@ int main(int argc, const char* argv[])
  data(177,"Bios/keyboard","AT (enhanced)"); /* or XT (bog standard) */
  data(187,"Display","VGA");
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sticks.cpp b/engines/avalanche/sticks.cpp
index 0e18be004f..840ca27ab7 100644
--- a/engines/avalanche/sticks.cpp
+++ b/engines/avalanche/sticks.cpp
@@ -37,6 +37,7 @@
 
 #include "sticks.h"
 
+namespace Avalanche {
 
 enum lmc {l,m,r, last_lmc}; /* Left, middle & right */
 
@@ -112,4 +113,6 @@ void joykeys()
  }
 }
 
-     /* No init code. */
\ No newline at end of file
+     /* No init code. */
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sticks.h b/engines/avalanche/sticks.h
index 24f59c4d59..c9235c065d 100644
--- a/engines/avalanche/sticks.h
+++ b/engines/avalanche/sticks.h
@@ -34,7 +34,11 @@
 /*#include "Gyro.h"*/
      /* for solidarity */
 
+namespace Avalanche {
+
 byte joyway();
 void joykeys();
 
 #endif
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/sunrise.cpp b/engines/avalanche/sunrise.cpp
index d512892093..a5c6b28d9b 100644
--- a/engines/avalanche/sunrise.cpp
+++ b/engines/avalanche/sunrise.cpp
@@ -28,6 +28,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 longint tskellern /*absolute $0:244*/; /* Over int $61 */
 
@@ -79,3 +81,5 @@ int main(int argc, const char* argv[])
  }
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/tempo.cpp b/engines/avalanche/tempo.cpp
index 908e7629b8..21ee150ea1 100644
--- a/engines/avalanche/tempo.cpp
+++ b/engines/avalanche/tempo.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 enum flavourtype {ch_ega,ch_bgi,ch_natural,ch_two,ch_one, last_flavourtype};
 
@@ -99,3 +100,5 @@ int main(int argc, const char* argv[])
  choose();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/test.cpp b/engines/avalanche/test.cpp
index ead8a372af..22e49d0872 100644
--- a/engines/avalanche/test.cpp
+++ b/engines/avalanche/test.cpp
@@ -28,6 +28,8 @@
 /*$M 2048,0,0*/
 /*#include "Dos.h"*/
 
+namespace Avalanche {
+
 const array<1,22,char> signature = string("*AVALOT* v1.00 ±tt± ")+'\3'+'\0';
 pointer saveint1f;
 int main(int argc, const char* argv[])
@@ -41,3 +43,5 @@ int main(int argc, const char* argv[])
  setintvec(0x1f,saveint1f);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/test2.cpp b/engines/avalanche/test2.cpp
index 0001ac0c0c..7efe64e77e 100644
--- a/engines/avalanche/test2.cpp
+++ b/engines/avalanche/test2.cpp
@@ -27,6 +27,8 @@
 
 /*#include "Dos.h"*/
 
+namespace Avalanche {
+
 const array<1,22,char> signature = string("*AVALOT* v1.00 ±tt± ")+'\3'+'\0';
 pointer getint1f;
 array<1,22,char> x;
@@ -38,4 +40,6 @@ int main(int argc, const char* argv[])
  if (x==signature) 
   output << "Signature found." << NL; else output << "Signature NOT found!" << NL;
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/testblit.cpp b/engines/avalanche/testblit.cpp
index 4154dcbe46..5fe1e3aca1 100644
--- a/engines/avalanche/testblit.cpp
+++ b/engines/avalanche/testblit.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 const integer ttp = 81920;
 const integer borland = xorput;
@@ -71,3 +72,5 @@ int main(int argc, const char* argv[])
  mblit();
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/testcard.cpp b/engines/avalanche/testcard.cpp
index 3a3fba5895..f435df0c9b 100644
--- a/engines/avalanche/testcard.cpp
+++ b/engines/avalanche/testcard.cpp
@@ -28,6 +28,8 @@
 #include "graph.h"
 /*#include "Dos.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 string filename;
 
@@ -78,3 +80,5 @@ int main(int argc, const char* argv[])
  close(f);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/testenh.cpp b/engines/avalanche/testenh.cpp
index b304a57623..86b01b5737 100644
--- a/engines/avalanche/testenh.cpp
+++ b/engines/avalanche/testenh.cpp
@@ -27,6 +27,8 @@
 
 /*#include "Enhanced.h"*/
 
+namespace Avalanche {
+
 int main(int argc, const char* argv[])
 {pio_initialize(argc, argv);
 ;
@@ -39,4 +41,6 @@ int main(int argc, const char* argv[])
   }
  } while (!(inchar=='\33'));
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/timeout.cpp b/engines/avalanche/timeout.cpp
index 073d415b98..2c83104a5d 100644
--- a/engines/avalanche/timeout.cpp
+++ b/engines/avalanche/timeout.cpp
@@ -47,6 +47,7 @@
 #include "Acci.h"
 #include "enid.h"
 
+namespace Avalanche {
 
 byte fv;
 
@@ -617,3 +618,5 @@ static unit_timeout_initialize timeout_constructor;
 unit_timeout_initialize::unit_timeout_initialize() {
  fillchar(times,sizeof(times),'\0');
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/timeout.h b/engines/avalanche/timeout.h
index 99090dd69a..ceb8c36dcc 100644
--- a/engines/avalanche/timeout.h
+++ b/engines/avalanche/timeout.h
@@ -32,6 +32,7 @@
 #include "gyro.h"
 #include "celer.h"
 
+namespace Avalanche {
 
 /* reason_ now runs between 1 and 28. */
 
@@ -253,4 +254,6 @@ void lose_timer(byte which);
 
  void give_lute_to_geida();
 
-#endif
+ } // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/travel.cpp b/engines/avalanche/travel.cpp
index 4ce11d5d3e..a9117c2e74 100644
--- a/engines/avalanche/travel.cpp
+++ b/engines/avalanche/travel.cpp
@@ -28,6 +28,8 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 
 void zoomout(integer x,integer y)
@@ -85,4 +87,6 @@ int main(int argc, const char* argv[])
  zoomin(577,124);
  zoomin(320,85);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/trip.cpp b/engines/avalanche/trip.cpp
index 64b8878668..867ea344bc 100644
--- a/engines/avalanche/trip.cpp
+++ b/engines/avalanche/trip.cpp
@@ -42,6 +42,7 @@
 #include "gyro.h"
 /*#include "Dos.h"*/
 
+namespace Avalanche {
 
 /*                                                                              */
 /*       EGA Graphic Primitive for Turbo Pascal 3.01A, Version 01FEB86.         */
@@ -161,4 +162,4 @@ void trippancy()
  budge();
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/trip.h b/engines/avalanche/trip.h
index abef803341..bfb645e3b5 100644
--- a/engines/avalanche/trip.h
+++ b/engines/avalanche/trip.h
@@ -28,6 +28,7 @@
 #ifndef __trip_h__
 #define __trip_h__
 
+namespace Avalanche {
 
  void loadtrip();
 
@@ -41,4 +42,6 @@
 
  void trippancy();
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/trip3.cpp b/engines/avalanche/trip3.cpp
index 4c04ef45b7..1ca78fbf47 100644
--- a/engines/avalanche/trip3.cpp
+++ b/engines/avalanche/trip3.cpp
@@ -36,6 +36,8 @@
 
 /*$S+*/
 
+namespace Avalanche {
+
 const integer avvy = 1;
 const integer test = 177;
 
@@ -254,3 +256,5 @@ static unit_trip3_initialize trip3_constructor;
 unit_trip3_initialize::unit_trip3_initialize() {; /* init portion of Trip3 */
  tramt=0;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/trip3.h b/engines/avalanche/trip3.h
index 9318726e45..4a5f6fb9d0 100644
--- a/engines/avalanche/trip3.h
+++ b/engines/avalanche/trip3.h
@@ -31,6 +31,7 @@
 
 #include "gyro.h"
 
+namespace Avalanche {
 
  void loadtrip();
 
@@ -44,4 +45,6 @@
 
  void enter(byte what_handle, integer xx,integer yy,integer lx,integer ly, byte mmx,byte mmy,byte st);
 
-#endif
+ } // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/trip42.cpp b/engines/avalanche/trip42.cpp
index 2dee6699e8..a587dc1e7e 100644
--- a/engines/avalanche/trip42.cpp
+++ b/engines/avalanche/trip42.cpp
@@ -42,6 +42,7 @@
 /*#include "Dropdown.h"*/
 /*#include "Access.h"*/
 
+namespace Avalanche {
 
 /*procedure copier(x1,y1,x2,y2,x3,y3,x4,y4:integer);
 
@@ -473,3 +474,5 @@ static unit_trip42_initialize trip42_constructor;
 unit_trip42_initialize::unit_trip42_initialize() {;
  getsetclear();
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/trip42.h b/engines/avalanche/trip42.h
index 72b94994b1..644a72190e 100644
--- a/engines/avalanche/trip42.h
+++ b/engines/avalanche/trip42.h
@@ -35,6 +35,7 @@
 /*#include "Gyro.h"*/
 /*#include "Sticks.h"*/
 
+namespace Avalanche {
 
 const integer maxgetset = 10;
 
@@ -113,5 +114,6 @@ EXTERN array<0,1,getsettype> getset;
 #undef EXTERN
 #define EXTERN extern
 
+} // End of namespace Avalanche.
 
-#endif
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/trip5.cpp b/engines/avalanche/trip5.cpp
index 5742bf3342..fc9429bc95 100644
--- a/engines/avalanche/trip5.cpp
+++ b/engines/avalanche/trip5.cpp
@@ -47,6 +47,7 @@
 /*#include "Sequence.h"*/
 /*#include "Enid.h"*/
 
+namespace Avalanche {
 
 void loadtrip()
 {
@@ -1911,3 +1912,5 @@ static unit_trip5_initialize trip5_constructor;
 unit_trip5_initialize::unit_trip5_initialize() {
  getsetclear(); mustexclaim=false;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/trip5.h b/engines/avalanche/trip5.h
index 3811c85ade..6c18232110 100644
--- a/engines/avalanche/trip5.h
+++ b/engines/avalanche/trip5.h
@@ -34,6 +34,8 @@
 /*#include "Gyro.h"*/
 /*#include "Sticks.h"*/
 
+namespace Avalanche {
+
 
 const integer maxgetset = 35;
 
@@ -198,5 +200,6 @@ EXTERN boolean mustexclaim; EXTERN word saywhat;
 #undef EXTERN
 #define EXTERN extern
 
+} // End of namespace Avalanche.
 
-#endif
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/trip5tst.cpp b/engines/avalanche/trip5tst.cpp
index 5b78efa9c5..8dbd985ab4 100644
--- a/engines/avalanche/trip5tst.cpp
+++ b/engines/avalanche/trip5tst.cpp
@@ -30,6 +30,8 @@
 
 /*$R+*/
 
+namespace Avalanche {
+
 struct adxtype {
            varying_string<12> name; /* name of character */
            varying_string<16> comment; /* comment */
@@ -156,4 +158,6 @@ int main(int argc, const char* argv[])
  plotone(0,0);
  close(inf);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/trip5xf.cpp b/engines/avalanche/trip5xf.cpp
index 09a8eac89d..f83f9c7ec2 100644
--- a/engines/avalanche/trip5xf.cpp
+++ b/engines/avalanche/trip5xf.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const string crlf = string('\15')+'\12'; const char eof_ = '\32';
 const array<1,177,char> trip5head = 
@@ -193,4 +194,6 @@ int main(int argc, const char* argv[])
  blockwrite(out,trip5foot,50);
  close(out);
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/tripoop.cpp b/engines/avalanche/tripoop.cpp
index 6ddc12c115..0edd926628 100644
--- a/engines/avalanche/tripoop.cpp
+++ b/engines/avalanche/tripoop.cpp
@@ -29,6 +29,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const integer up = 0;
 const integer right = 1;
@@ -312,4 +313,6 @@ int main(int argc, const char* argv[])
   } while (!keypressed());
  }
 return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/ttmenuxf.cpp b/engines/avalanche/ttmenuxf.cpp
index ad986e1822..536ebcdccc 100644
--- a/engines/avalanche/ttmenuxf.cpp
+++ b/engines/avalanche/ttmenuxf.cpp
@@ -29,6 +29,8 @@
 /*#include "Tommys.h"*/
 /*#include "Crt.h"*/
 
+namespace Avalanche {
+
 integer gd,gm;
 word s; pointer p;
 file<byte> f;
@@ -134,3 +136,5 @@ int main(int argc, const char* argv[])
  close(f);
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/unsquish.cpp b/engines/avalanche/unsquish.cpp
index bf98aebc0c..e0ede8e35d 100644
--- a/engines/avalanche/unsquish.cpp
+++ b/engines/avalanche/unsquish.cpp
@@ -28,6 +28,7 @@
 /*$S-*/
 #include "graph.h"
 
+namespace Avalanche {
 
 typedef array<1,50000,byte> buffertype;
 
@@ -546,4 +547,4 @@ delete buffer;
 return EXIT_SUCCESS;
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/viewdocs.cpp b/engines/avalanche/viewdocs.cpp
index 52edfe4fbd..58dc7b6e35 100644
--- a/engines/avalanche/viewdocs.cpp
+++ b/engines/avalanche/viewdocs.cpp
@@ -30,6 +30,7 @@
 /*#include "crt.h"*/
 /*#include "tommys.h"*/
 
+namespace Avalanche {
 
 typedef array<0,49999,byte> bigtextarray;
 struct chaptertype {
@@ -545,3 +546,5 @@ int main(int argc, const char* argv[])
  endit();
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/visa.cpp b/engines/avalanche/visa.cpp
index dea03b179d..c801a741d6 100644
--- a/engines/avalanche/visa.cpp
+++ b/engines/avalanche/visa.cpp
@@ -44,6 +44,7 @@
 /*#include "Trip5.h"*/
 /*#include "Lucerna.h"*/
 
+namespace Avalanche {
 
 const boolean bubbling = false;
 const boolean report_dixi_errors = true;
@@ -286,4 +287,4 @@ void talkto(byte whom)
  }
 }
 
-
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/visa.h b/engines/avalanche/visa.h
index 0c695fb071..474a0098c6 100644
--- a/engines/avalanche/visa.h
+++ b/engines/avalanche/visa.h
@@ -28,9 +28,12 @@
 #ifndef __visa_h__
 #define __visa_h__
 
+namespace Avalanche {
 
 void dixi(char block, byte point);
 
 void talkto(byte whom);
 
-#endif
+} // End of namespace Avalanche.
+
+#endif
\ No newline at end of file
diff --git a/engines/avalanche/visatest.cpp b/engines/avalanche/visatest.cpp
index 5cbcf64326..8544239473 100644
--- a/engines/avalanche/visatest.cpp
+++ b/engines/avalanche/visatest.cpp
@@ -27,6 +27,7 @@
 
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 char block;
 word point;
@@ -105,4 +106,6 @@ int main(int argc, const char* argv[])
   display_it();
  } while (!false);
  return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/xf_gover.cpp b/engines/avalanche/xf_gover.cpp
index 98590e63b9..074c3b1178 100644
--- a/engines/avalanche/xf_gover.cpp
+++ b/engines/avalanche/xf_gover.cpp
@@ -27,6 +27,7 @@
 
 #include "graph.h"
 
+namespace Avalanche {
 
 void load()
 {
@@ -117,3 +118,5 @@ int main(int argc, const char* argv[])
  dump_to_file(26,88,78,147,"gameover.avd");
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/xf_help.cpp b/engines/avalanche/xf_help.cpp
index ec7b1d1405..7a99b50646 100644
--- a/engines/avalanche/xf_help.cpp
+++ b/engines/avalanche/xf_help.cpp
@@ -28,6 +28,7 @@
 /*#include "Crt.h"*/
 /*#include "Tommys.h"*/
 
+namespace Avalanche {
 
 const integer max_pages = 34;
 
@@ -107,4 +108,6 @@ int main(int argc, const char* argv[])
 
  close(o);
  return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/xf_visa.cpp b/engines/avalanche/xf_visa.cpp
index c0b2573ba8..4df55cdce5 100644
--- a/engines/avalanche/xf_visa.cpp
+++ b/engines/avalanche/xf_visa.cpp
@@ -30,6 +30,8 @@
 
 /*$R+*/
 
+namespace Avalanche {
+
 const varying_string<9> used = "DNPQSTUXZ";
 
 const varying_string<12> header = string("Avalot Sez:")+'\32';
@@ -199,4 +201,6 @@ int main(int argc, const char* argv[])
 
  write_out(); 
  return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/xfbutton.cpp b/engines/avalanche/xfbutton.cpp
index 197aa960a3..013a121666 100644
--- a/engines/avalanche/xfbutton.cpp
+++ b/engines/avalanche/xfbutton.cpp
@@ -27,6 +27,8 @@
 
 #include "graph.h"
 
+namespace Avalanche {
+
 integer x,y;
 untyped_file f,out;
 
@@ -84,3 +86,5 @@ int main(int argc, const char* argv[])
  close(out);
  return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/xfghost.cpp b/engines/avalanche/xfghost.cpp
index 6eeec28628..1c7673c401 100644
--- a/engines/avalanche/xfghost.cpp
+++ b/engines/avalanche/xfghost.cpp
@@ -28,6 +28,7 @@
 #include "graph.h"
 /*#include "Crt.h"*/
 
+namespace Avalanche {
 
 const array<1,44,char> chunkheader = 
 string("Spooky file! Nearly a Chunk... (c) MT.")+'\32'+'\261'+'\x30'+'\x1'+'\x75'+'\261';
@@ -268,3 +269,5 @@ int main(int argc, const char* argv[])
 #endif
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file
diff --git a/engines/avalanche/zapdraw.cpp b/engines/avalanche/zapdraw.cpp
index 9b13dbbec9..fe1619a4c3 100644
--- a/engines/avalanche/zapdraw.cpp
+++ b/engines/avalanche/zapdraw.cpp
@@ -29,6 +29,7 @@
 /*#include "Crt.h"*/
 /*#include "Dos.h"*/
 
+namespace Avalanche {
 
 untyped_file f;
 byte bit;
@@ -60,3 +61,5 @@ int main(int argc, const char* argv[])
  rectangle(  0, 10, 27, 19);
 return EXIT_SUCCESS;
 }
+
+} // End of namespace Avalanche.
\ No newline at end of file