12 files changed, 43 insertions, 5 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 39608158b1..e7a9318dae 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -23,6 +23,8 @@
 #include "cutaway.h"
 #include "graphics.h"
 
+namespace Queen {
+
 /*
 	 Functions needed:
 
@@ -1036,3 +1038,4 @@ void QueenCutaway::talk(char *nextFilename) {
 	}
 }
 
+} // End of namespace Queen
diff --git a/queen/cutaway.h b/queen/cutaway.h
index 87f0b1f99c..38473e8589 100644
--- a/queen/cutaway.h
+++ b/queen/cutaway.h
@@ -24,6 +24,8 @@
 
 #include "queen/queen.h"
 
+namespace Queen {
+
 class QueenResource;
 class QueenLogic;
 class QueenGraphics;
@@ -248,5 +250,6 @@ class QueenCutaway {
 
 };
 
-#endif
+} // End of namespace Queen
 
+#endif
diff --git a/queen/graphics.cpp b/queen/graphics.cpp
index 7f464675f6..bd185cadc2 100644
--- a/queen/graphics.cpp
+++ b/queen/graphics.cpp
@@ -21,6 +21,7 @@
 
 #include "queen/graphics.h"
 
+namespace Queen {
 
 QueenGraphics::QueenGraphics(QueenResource *resource)
 	:_resource(resource) {
@@ -509,3 +510,5 @@ void QueenGraphics::frameErase(uint32 fslot) {
 	delete[] pbf->data;
 
 }
+
+} // End of namespace Queen
diff --git a/queen/graphics.h b/queen/graphics.h
index f630304dc5..2b2d8a1a79 100644
--- a/queen/graphics.h
+++ b/queen/graphics.h
@@ -24,6 +24,7 @@
 
 #include "queen/queen.h"
 
+namespace Queen {
 
 #define MAX_BANK_SIZE      110
 #define MAX_FRAMES_NUMBER  256
@@ -134,5 +135,6 @@ private:
 	
 };
 
-#endif
+} // End of namespace Queen
 
+#endif
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 2bf1a6fb69..ff08881946 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -21,6 +21,8 @@
 
 #include "queen/logic.h"
 
+namespace Queen {
+
 QueenLogic::QueenLogic(QueenResource *resource) 
 	: _maxAnimatedFrame(0), _maxStaticFrame(0), _resource(resource) {
 	_jas = _resource->loadFile("QUEEN.JAS", 20);
@@ -370,3 +372,5 @@ uint16 QueenLogic::findFrame(uint16 obj) {
 	}
 	return framenum;
 }
+
+} // End of namespace Queen
diff --git a/queen/logic.h b/queen/logic.h
index c1806728d1..93af38d6b7 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -24,6 +24,7 @@
 
 #include "queen/queen.h"
 
+namespace Queen {
 
 struct GraphicData {
 	uint16 x, y;
@@ -101,4 +102,6 @@ protected:
 	void initialise();
 };
 
+} // End of namespace Queen
+
 #endif
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 3668c57e03..dd400d5be9 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -45,11 +45,13 @@ const TargetSettings *Engine_QUEEN_targetList() {
 }
 
 Engine *Engine_QUEEN_create(GameDetector *detector, OSystem *syst) {
-	return new QueenEngine(detector, syst);
+	return new Queen::QueenEngine(detector, syst);
 }
 
 REGISTER_PLUGIN("Flight of the Amazon Queen", Engine_QUEEN_targetList, Engine_QUEEN_create);
 
+namespace Queen {
+
 QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
 	: Engine(detector, syst) {
 	
@@ -179,3 +181,4 @@ void QueenEngine::delay(uint amount) {
 	} while (cur < start + amount);
 }
 
+} // End of namespace Queen
diff --git a/queen/queen.h b/queen/queen.h
index 6f6bf65925..c7e9ab7ed5 100644
--- a/queen/queen.h
+++ b/queen/queen.h
@@ -31,6 +31,8 @@
 #include "queen/logic.h"
 #include "common/config-file.h"
 
+namespace Queen {
+
 class QueenLogic;
 
 class QueenEngine : public Engine {
@@ -68,4 +70,6 @@ protected:
 	static int CDECL game_thread_proc(void *param);
 };
 
+} // End of namespace Queen
+
 #endif
diff --git a/queen/resource.cpp b/queen/resource.cpp
index 32dc9dd375..93adca08c2 100644
--- a/queen/resource.cpp
+++ b/queen/resource.cpp
@@ -22,6 +22,8 @@
 #include "queen/queen.h"
 #include "queen/resource.h"
 
+namespace Queen {
+
 #define	DEMO_JAS_VERSION_OFFSET	0x119A8
 #define JAS_VERSION_OFFSET	0x12484
 
@@ -142,3 +144,4 @@ bool QueenResource::isDemo() {
 	return _gameVersion->isDemo;
 }
 
+} // End of namespace Queen
diff --git a/queen/resource.h b/queen/resource.h
index 40139a215d..c0bc655fb4 100644
--- a/queen/resource.h
+++ b/queen/resource.h
@@ -19,11 +19,13 @@
  *
  */
 
-#ifndef QUEENRESOURCE_H
-#define QUEENRESOURCE_H
+#ifndef QUEEN_RESOURCE_H
+#define QUEEN_RESOURCE_H
 
 #include "common/file.h"
 
+namespace Queen {
+
 struct ResourceEntry {
 	char filename[13];
 	uint8 inBundle;
@@ -68,5 +70,7 @@ protected:
 	const char *JASVersion();
 };
 
+} // End of namespace Queen
+
 #endif
 
diff --git a/queen/restables.cpp b/queen/restables.cpp
index 386909d035..db23226025 100644
--- a/queen/restables.cpp
+++ b/queen/restables.cpp
@@ -21,6 +21,8 @@
 
 #include "queen/resource.h"
 
+namespace Queen {
+
 //English Floppy Demo v1
 const ResourceEntry QueenResource::_resourceTablePE100v1[] = {
 	{ "ANDERSON.ACT", 1, 0x00000000, 0x00007c0a },
@@ -9094,3 +9096,4 @@ const ResourceEntry QueenResource::_resourceTableCEM10[] = {
 	{ "ZOMBIE2.DOG", 1, 0x0b5f218d, 0x00000c40 }
 };
 
+} // End of namespace Queen
diff --git a/queen/version.cpp b/queen/version.cpp
index 1953590347..3e68b4bcca 100644
--- a/queen/version.cpp
+++ b/queen/version.cpp
@@ -21,6 +21,8 @@
 
 #include "queen/resource.h"
 
+namespace Queen {
+
 //English Floppy Demo v1
 const GameVersion QueenResource::_gameVersionPE100v1 = {
 	"PE100",
@@ -57,3 +59,4 @@ const GameVersion QueenResource::_gameVersionCEM10 = {
 	_resourceTableCEM10
 };
 
+} // End of namespace Queen