diff --git a/lib/tokenize.h b/lib/tokenize.h
index 743808341..eafd5370f 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -135,10 +135,6 @@ public:
      */
     bool simplifyCalculations();
 
-#ifndef _MSC_VER
-private:
-#endif
-
     /** Insert array size where it isn't given */
     void arraySize();
 
@@ -408,9 +404,6 @@ private:
      */
     void updateClassList();
 
-    /** Disable assignments.. */
-    Tokenizer(const Tokenizer &);
-
     /**
      * assert that tokens are ok - used during debugging for example
      * to catch problems in simplifyTokenList.
@@ -448,7 +441,12 @@ private:
     bool duplicateTypedef(Token **tokPtr, const Token *name);
     void duplicateTypedefError(const Token *tok1, const Token *tok2, const std::string & type);
 
-    /** Disable assignment operator */
+
+private:
+    /** Disable copy constructor, no implementation */
+    Tokenizer(const Tokenizer &);
+
+    /** Disable assignment operator, no implementation */
     Tokenizer &operator=(const Tokenizer &);
 
     Token *_tokens, *_tokensBack;
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index c1754b5e0..02e09685f 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -19,9 +19,7 @@
 
 
 #include "testsuite.h"
-#define private public
 #include "tokenize.h"
-#undef private
 #include "token.h"
 #include <sstream>
 
@@ -2347,7 +2345,6 @@ private:
 
         Settings settings;
         Tokenizer tokenizer(&settings, this);
-        tokenizer._files.push_back("test.cpp");
 
         std::istringstream istr(code);
         tokenizer.createTokens(istr);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 8039cb761..88f8fc548 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -23,9 +23,7 @@
 
 #include <cstring>
 #include "testsuite.h"
-#define private public
 #include "tokenize.h"
-#undef private
 #include "token.h"
 
 extern std::ostringstream errout;