Index: code/trunk/src/core/ArgumentCompletionListElement.h
===================================================================
--- code/trunk/src/core/ArgumentCompletionListElement.h	(revision 1783)
+++ code/trunk/src/core/ArgumentCompletionListElement.h	(revision 1784)
@@ -35,10 +35,11 @@
 #include <list>
 
-#define ACL_MODE_NORMAL    1
-#define ACL_MODE_LOWERCASE 2
-#define ACL_MODE_DISPLAY   4
 
 namespace orxonox
 {
+    const int ACL_MODE_NORMAL    = 1;
+    const int ACL_MODE_LOWERCASE = 2;
+    const int ACL_MODE_DISPLAY   = 4;
+
     typedef std::list<ArgumentCompletionListElement> ArgumentCompletionList;
 
Index: code/trunk/src/core/CommandExecutor.cc
===================================================================
--- code/trunk/src/core/CommandExecutor.cc	(revision 1783)
+++ code/trunk/src/core/CommandExecutor.cc	(revision 1784)
@@ -30,5 +30,4 @@
 #include "ConsoleCommand.h"
 #include "util/String.h"
-#include "util/Convert.h"
 #include "util/Debug.h"
 #include "Identifier.h"
Index: code/trunk/src/core/ConfigFileManager.cc
===================================================================
--- code/trunk/src/core/ConfigFileManager.cc	(revision 1783)
+++ code/trunk/src/core/ConfigFileManager.cc	(revision 1784)
@@ -34,8 +34,10 @@
 #include "util/String.h"
 
-#define CONFIG_FILE_MAX_LINELENGHT 1024
 
 namespace orxonox
 {
+    const int CONFIG_FILE_MAX_LINELENGHT  = 1024;
+    const char* const DEFAULT_CONFIG_FILE = "default.ini";
+
     SetConsoleCommandShortcutExtern(config).argumentCompleter(0, autocompletion::configvalueclasses()).argumentCompleter(1, autocompletion::configvalues()).argumentCompleter(2, autocompletion::configvalue());
     SetConsoleCommandShortcutExtern(tconfig).argumentCompleter(0, autocompletion::configvalueclasses()).argumentCompleter(1, autocompletion::configvalues()).argumentCompleter(2, autocompletion::configvalue());
Index: code/trunk/src/core/ConfigFileManager.h
===================================================================
--- code/trunk/src/core/ConfigFileManager.h	(revision 1783)
+++ code/trunk/src/core/ConfigFileManager.h	(revision 1784)
@@ -38,6 +38,4 @@
 
 #include "util/Math.h"
-
-#define DEFAULT_CONFIG_FILE "default.ini"
 
 namespace orxonox
Index: code/trunk/src/core/ConfigValueContainer.cc
===================================================================
--- code/trunk/src/core/ConfigValueContainer.cc	(revision 1783)
+++ code/trunk/src/core/ConfigValueContainer.cc	(revision 1784)
@@ -41,9 +41,10 @@
 #include "Identifier.h"
 
-#define MAX_VECTOR_INDEX 255 // to avoid up to 4*10^9 vector entries in the config file after accidentally using a wrong argument
 
 
 namespace orxonox
 {
+    const int MAX_VECTOR_INDEX  = 255; // to avoid up to 4*10^9 vector entries in the config file after accidentally using a wrong argument
+
     /**
         @brief Initializes the ConfigValueContainer with defaultvalues.
Index: code/trunk/src/core/Functor.h
===================================================================
--- code/trunk/src/core/Functor.h	(revision 1783)
+++ code/trunk/src/core/Functor.h	(revision 1784)
@@ -36,8 +36,9 @@
 #include "util/Debug.h"
 
-#define MAX_FUNCTOR_ARGUMENTS 5
 
 namespace orxonox
 {
+    const int MAX_FUNCTOR_ARGUMENTS = 5;
+
     enum FunctionType
     {
Index: code/trunk/src/core/IRC.cc
===================================================================
--- code/trunk/src/core/IRC.cc	(revision 1783)
+++ code/trunk/src/core/IRC.cc	(revision 1784)
@@ -35,8 +35,9 @@
 #include "util/Convert.h"
 
-#define IRC_TCL_THREADID 1421421421
 
 namespace orxonox
 {
+    static const unsigned int IRC_TCL_THREADID  = 1421421421;
+
     SetConsoleCommand(IRC, say,  true).accessLevel(AccessLevel::User);
     SetConsoleCommand(IRC, msg,  false).accessLevel(AccessLevel::User);
Index: code/trunk/src/core/TclThreadManager.cc
===================================================================
--- code/trunk/src/core/TclThreadManager.cc	(revision 1783)
+++ code/trunk/src/core/TclThreadManager.cc	(revision 1784)
@@ -43,9 +43,10 @@
 #include "util/Convert.h"
 
-#define TCLTHREADMANAGER_MAX_QUEUE_LENGTH 100
-#define TCLTHREADMANAGER_MAX_CPU_USAGE 0.50
 
 namespace orxonox
 {
+    const int TCLTHREADMANAGER_MAX_QUEUE_LENGTH = 100;
+    const int TCLTHREADMANAGER_MAX_CPU_USAGE    = 0.50;
+
     SetConsoleCommandShortcutAlias(TclThreadManager, execute, "tclexecute").argumentCompleter(0, autocompletion::tclthreads());
     SetConsoleCommandShortcutAlias(TclThreadManager, query,   "tclquery"  ).argumentCompleter(0, autocompletion::tclthreads());
