diff --git a/CheckBufferOverrun.cpp b/CheckBufferOverrun.cpp
index 689d1782b..9086bcf77 100644
--- a/CheckBufferOverrun.cpp
+++ b/CheckBufferOverrun.cpp
@@ -30,12 +30,10 @@
 
 #include <stdlib.h>     // <- strtoul
 
-//---------------------------------------------------------------------------
-extern bool ShowAll;
 //---------------------------------------------------------------------------
 
 // CallStack used when parsing into subfunctions.
-static std::list<const TOKEN *> CallStack;
+
 
 CheckBufferOverrunClass::CheckBufferOverrunClass( Tokenizer *tokenizer )
 {
diff --git a/CheckBufferOverrun.h b/CheckBufferOverrun.h
index ef8bdfc16..ea086ca58 100644
--- a/CheckBufferOverrun.h
+++ b/CheckBufferOverrun.h
@@ -42,7 +42,8 @@ private:
     void CheckBufferOverrun_CheckScope( const TOKEN *tok, const char *varname[], const int size, const int total_size );
     void ReportError(const TOKEN *tok, const char errmsg[]);
 
-    Tokenizer *_tokenizer;
+    Tokenizer *_tokenizer;
+    std::list<const TOKEN *> CallStack;
 };
 
 //---------------------------------------------------------------------------
diff --git a/CheckClass.cpp b/CheckClass.cpp
index dd5db8ffd..ced8a18ea 100644
--- a/CheckClass.cpp
+++ b/CheckClass.cpp
@@ -34,8 +34,16 @@
 #endif
 //---------------------------------------------------------------------------
 
-extern bool CheckCodingStyle;
-
+CheckClass::CheckClass( Tokenizer *tokenizer, const Settings &settings )
+{
+    _tokenizer = tokenizer;
+    _settings = settings;
+}
+
+CheckClass::~CheckClass()
+{
+
+}
 
 //---------------------------------------------------------------------------
 
@@ -101,16 +109,6 @@ struct VAR *CheckClass::ClassChecking_GetVarList(const TOKEN *tok1)
 }
 //---------------------------------------------------------------------------
 
-CheckClass::CheckClass( Tokenizer *tokenizer )
-{
-    _tokenizer = tokenizer;
-}
-
-CheckClass::~CheckClass()
-{
-
-}
-
 const TOKEN * CheckClass::FindClassFunction( const TOKEN *tok, const char classname[], const char funcname[], int &indentlevel )
 {
     const char *_classname[2] = {0,0};
@@ -332,7 +330,7 @@ void CheckClass::CheckConstructors()
         if ( ! constructor_token )
         {
             // There's no class constructor
-            if ( CheckCodingStyle )
+            if ( _settings._checkCodingStyle )
             {
                 // Check that all member variables are initialized..
                 struct VAR *varlist = ClassChecking_GetVarList(tok1);
diff --git a/CheckClass.h b/CheckClass.h
index 47e55596e..b6e4dea5e 100644
--- a/CheckClass.h
+++ b/CheckClass.h
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "tokenize.h"
+#include "settings.h"
 #include <list>
 
 struct VAR
@@ -34,7 +35,7 @@ struct VAR
 class CheckClass
 {
 public:
-    CheckClass( Tokenizer *tokenizer );
+    CheckClass( Tokenizer *tokenizer, const Settings &settings );
     ~CheckClass();
 
     void CheckConstructors();
@@ -52,6 +53,7 @@ private:
     struct VAR *ClassChecking_GetVarList(const TOKEN *tok1);
 
     Tokenizer *_tokenizer;
+    Settings _settings;
 };
 //---------------------------------------------------------------------------
 #endif
diff --git a/CheckMemoryLeak.cpp b/CheckMemoryLeak.cpp
index 39589e740..bbc026e9e 100644
--- a/CheckMemoryLeak.cpp
+++ b/CheckMemoryLeak.cpp
@@ -41,9 +41,10 @@
 
 //---------------------------------------------------------------------------
 
-CheckMemoryLeakClass::CheckMemoryLeakClass( Tokenizer *tokenizer )
+CheckMemoryLeakClass::CheckMemoryLeakClass( Tokenizer *tokenizer, const Settings &settings )
 {
-    _tokenizer = tokenizer;
+    _tokenizer = tokenizer;
+    _settings = settings;
 }
 
 CheckMemoryLeakClass::~CheckMemoryLeakClass()
@@ -281,9 +282,6 @@ bool CheckMemoryLeakClass::notvar(const TOKEN *tok, const char *varnames[])
                  Match(tok, "%var1% == 0", varnames) );
 }
 
-
-extern bool ShowAll;
-
 /**
  * Extract a new tokens list that is easier to parse than the "tokens"
  * tok - start parse token
@@ -344,7 +342,7 @@ TOKEN *CheckMemoryLeakClass::getcode(const TOKEN *tok, std::list<const TOKEN *>
             AllocType alloc = GetAllocationType(Tokenizer::gettok(tok,3));
 
             // If "--all" hasn't been given, don't check classes..
-            if ( alloc == New && ! ShowAll )
+            if ( alloc == New && ! _settings._showAll )
             {
                 if ( Match(Tokenizer::gettok(tok,3), "new %type% [(;]") )
                 {
@@ -941,7 +939,7 @@ void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers_ParseClass( const TOKEN
         {
             if ( IsName(tok->str) || strchr(";}", tok->str[0]) )
             {
-                if (ShowAll || !isclass(Tokenizer::getstr(tok,1)))
+                if (_settings._showAll || !isclass(Tokenizer::getstr(tok,1)))
                     CheckMemoryLeak_ClassMembers_Variable( classname, Tokenizer::getstr(tok, 3) );
             }
         }
diff --git a/CheckMemoryLeak.h b/CheckMemoryLeak.h
index cc5ed15ac..0624265a4 100644
--- a/CheckMemoryLeak.h
+++ b/CheckMemoryLeak.h
@@ -26,6 +26,7 @@
 /** \brief Check for memory leaks */
 
 #include "tokenize.h"
+#include "settings.h"
 #include <list>
 #include <vector>
 
@@ -34,7 +35,7 @@ enum AllocType { No, Malloc, gMalloc, New, NewA };
 class CheckMemoryLeakClass
 {
 public:
-    CheckMemoryLeakClass( Tokenizer *tokenizer );
+    CheckMemoryLeakClass( Tokenizer *tokenizer, const Settings &settings );
     ~CheckMemoryLeakClass();
     void CheckMemoryLeak();
 
@@ -58,6 +59,7 @@ private:
     bool isclass( const std::string &typestr );
 
     Tokenizer *_tokenizer;
+    Settings _settings;
 };
 
 //---------------------------------------------------------------------------
diff --git a/cppcheck.cpp b/cppcheck.cpp
index a28ea66c7..0875eee3e 100644
--- a/cppcheck.cpp
+++ b/cppcheck.cpp
@@ -34,12 +34,6 @@
 #include <fstream>
 #include <map>
 
-
-//---------------------------------------------------------------------------
-bool Debug = false;
-bool ShowAll = false;
-bool CheckCodingStyle = false;
-bool ErrorsOnly = false;
 //---------------------------------------------------------------------------
 
 CppCheck::CppCheck()
@@ -83,10 +77,6 @@ void CppCheck::check(int argc, char* argv[])
             pathnames.push_back( argv[i] );
     }
 
-    Debug = _settings._debug;
-    ShowAll = _settings._showAll;
-    CheckCodingStyle = _settings._checkCodingStyle;
-    ErrorsOnly = _settings._errorsOnly;
     _tokenizer.settings( _settings );
 
     std::vector<std::string> filenames;
@@ -206,7 +196,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[], unsigne
     // Check that the memsets are valid.
     // The 'memset' function can do dangerous things if used wrong.
     // Important: The checking doesn't work on simplified tokens list.
-    CheckClass checkClass( &_tokenizer );
+    CheckClass checkClass( &_tokenizer, _settings );
     checkClass.CheckMemset();
 
 
@@ -222,7 +212,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[], unsigne
 
 
     // Including header which is not needed (too many false positives)
-//    if ( CheckCodingStyle )
+//    if ( _settings._checkCodingStyle )
 //    {
 //        CheckHeaders checkHeaders( &tokenizer );
 //        checkHeaders.WarningIncludeHeader();
@@ -232,7 +222,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[], unsigne
     _tokenizer.SimplifyTokenList();
 
     // Memory leak
-    CheckMemoryLeakClass checkMemoryLeak( &_tokenizer );
+    CheckMemoryLeakClass checkMemoryLeak( &_tokenizer, _settings );
     checkMemoryLeak.CheckMemoryLeak();
 
     // Buffer overruns..
diff --git a/testbufferoverrun.cpp b/testbufferoverrun.cpp
index 9db75aa60..aadc831fa 100644
--- a/testbufferoverrun.cpp
+++ b/testbufferoverrun.cpp
@@ -26,7 +26,6 @@
 #include <sstream>
 
 extern std::ostringstream errout;
-extern bool ShowAll;
 
 class TestBufferOverrun : public TestFixture
 {
@@ -54,7 +53,6 @@ private:
         errout.str("");
 
         // Check for memory leaks..
-        ShowAll = true;
         CheckBufferOverrunClass checkBufferOverrun( &tokenizer );
         checkBufferOverrun.CheckBufferOverrun();
 
diff --git a/testcharvar.cpp b/testcharvar.cpp
index 9ffaf6257..5cd54470a 100644
--- a/testcharvar.cpp
+++ b/testcharvar.cpp
@@ -25,7 +25,6 @@
 #include <sstream>
 
 extern std::ostringstream errout;
-extern bool ShowAll;
 
 class TestCharVar : public TestFixture
 {
@@ -59,7 +58,6 @@ private:
         errout.str("");
 
         // Check for memory leaks..
-        ShowAll = true;
         CheckOther checkOther( &tokenizer );
         checkOther.CheckCharVariable();
 
diff --git a/testconstructors.cpp b/testconstructors.cpp
index 826b770a2..140746d0b 100644
--- a/testconstructors.cpp
+++ b/testconstructors.cpp
@@ -24,7 +24,7 @@
 
 #include <sstream>
 
-extern std::ostringstream errout;
+extern std::ostringstream errout;
 
 class TestConstructors : public TestFixture
 {
@@ -45,8 +45,10 @@ private:
         // Clear the error buffer..
         errout.str("");
 
-        // Check for memory leaks..
-        CheckClass checkClass( &tokenizer );
+        // Check for memory leaks..
+        Settings settings;
+        settings._checkCodingStyle = true;
+        CheckClass checkClass( &tokenizer, settings );
         checkClass.CheckConstructors();
 
         tokenizer.DeallocateTokens();
diff --git a/testdivision.cpp b/testdivision.cpp
index b807a2161..0618633f9 100644
--- a/testdivision.cpp
+++ b/testdivision.cpp
@@ -28,7 +28,6 @@
 #include <sstream>
 
 extern std::ostringstream errout;
-extern bool ShowAll;
 
 class TestDivision : public TestFixture
 {
@@ -50,7 +49,6 @@ private:
         errout.str("");
 
         // Check for memory leaks..
-        ShowAll = true;
         CheckOther checkOther( &tokenizer );
         checkOther.CheckUnsignedDivision();
 
diff --git a/testmemleak.cpp b/testmemleak.cpp
index c47341bf3..77b00d1f6 100644
--- a/testmemleak.cpp
+++ b/testmemleak.cpp
@@ -27,7 +27,6 @@
 #include <sstream>
 
 extern std::ostringstream errout;
-extern bool ShowAll;
 
 class TestMemleak : public TestFixture
 {
@@ -49,12 +48,12 @@ private:
         errout.str("");
 
         // Check for memory leaks..
-        ShowAll = false;
         Settings settings;
-        settings._checkCodingStyle = true;
+        settings._checkCodingStyle = true;
+        settings._showAll = false;
         tokenizer.settings( settings );
         tokenizer.FillFunctionList(0);
-        CheckMemoryLeakClass checkMemoryLeak( &tokenizer );
+        CheckMemoryLeakClass checkMemoryLeak( &tokenizer, settings );
         checkMemoryLeak.CheckMemoryLeak();
 
         tokenizer.DeallocateTokens();
diff --git a/testrunner.cpp b/testrunner.cpp
index 3a1aa05a3..162df639c 100644
--- a/testrunner.cpp
+++ b/testrunner.cpp
@@ -20,14 +20,9 @@
 #include "testsuite.h"
 #include <string>
 #include <vector>
-
-extern bool ShowAll;
-extern bool CheckCodingStyle;
 
 int main(int argc, const char *argv[])
 {
-    ShowAll = false;
-    CheckCodingStyle = true;
     TestFixture::runTests( (argc==2) ? argv[1] : NULL );
     return 0;
 }
diff --git a/testunusedprivfunc.cpp b/testunusedprivfunc.cpp
index 8d7adf5dd..6c292c627 100644
--- a/testunusedprivfunc.cpp
+++ b/testunusedprivfunc.cpp
@@ -24,7 +24,6 @@
 #include <sstream>
 
 extern std::ostringstream errout;
-extern bool ShowAll;
 
 class TestUnusedPrivateFunction : public TestFixture
 {
@@ -53,8 +52,10 @@ private:
         // Clear the error buffer..
         errout.str("");
 
-        // Check for unused private functions..
-        CheckClass checkClass( &tokenizer );
+        // Check for unused private functions..
+        Settings settings;
+        settings._checkCodingStyle = true;
+        CheckClass checkClass( &tokenizer, settings );
         checkClass.CheckUnusedPrivateFunctions();
 
         tokenizer.DeallocateTokens();
diff --git a/tokenize.cpp b/tokenize.cpp
index 72f45bc76..e67c9d075 100644
--- a/tokenize.cpp
+++ b/tokenize.cpp
@@ -69,6 +69,7 @@ Tokenizer::Tokenizer()
 {
     tokens = 0;
     tokens_back = 0;
+    dsymlist = 0;
 }
 
 Tokenizer::~Tokenizer()
@@ -81,13 +82,7 @@ Tokenizer::~Tokenizer()
 // "#define abc 123" will create a defined symbol "abc" with the value 123
 //---------------------------------------------------------------------------
 
-struct DefineSymbol
-{
-    char *name;
-    char *value;
-    struct DefineSymbol *next;
-};
-static struct DefineSymbol * dsymlist;
+
 
 std::vector<std::string> *Tokenizer::getFiles()
 {
diff --git a/tokenize.h b/tokenize.h
index 7cd1e21e5..65eaae88b 100644
--- a/tokenize.h
+++ b/tokenize.h
@@ -94,11 +94,16 @@ public:
 
     void FillFunctionList(const unsigned int file_id);
     const TOKEN *GetFunctionTokenByName( const char funcname[] ) const;
-void CheckGlobalFunctionUsage(const std::vector<std::string> &filenames);
+    void CheckGlobalFunctionUsage(const std::vector<std::string> &filenames);
     void settings( const Settings &settings );
 private:
 
-
+    struct DefineSymbol
+    {
+        char *name;
+        char *value;
+        struct DefineSymbol *next;
+    };
 
     class GlobalFunction
     {
@@ -136,6 +141,9 @@ private:
     std::list< GlobalFunction > UsedGlobalFunctions;
     std::vector<std::string> Files;
     Settings _settings;
+
+
+    struct DefineSymbol * dsymlist;
 };