diff --git a/lib/tokenlist.h b/lib/tokenlist.h
index 60edcf74e..80b07ea8f 100644
--- a/lib/tokenlist.h
+++ b/lib/tokenlist.h
@@ -135,9 +135,6 @@ private:
     /** Disable assignment operator, no implementation */
     TokenList &operator=(const TokenList &);
 
-public:
-
-private: /// private
     /** Token list */
     Token *_front, *_back;
 
diff --git a/test/testsuite.cpp b/test/testsuite.cpp
index 594c6add4..2fd714b6e 100644
--- a/test/testsuite.cpp
+++ b/test/testsuite.cpp
@@ -86,7 +86,6 @@ bool TestFixture::prepareTest(const char testname[])
         } else {
             std::cout << classname << "::" << testname << std::endl;
         }
-        _lib = Library();
         currentTest = classname + "::" + testname;
         return true;
     }
diff --git a/test/testsuite.h b/test/testsuite.h
index 30a0fc72c..00d17c960 100644
--- a/test/testsuite.h
+++ b/test/testsuite.h
@@ -24,7 +24,6 @@
 #include <set>
 #include "errorlogger.h"
 #include "redirect.h"
-#include "library.h"
 
 class options;
 
@@ -38,7 +37,6 @@ private:
     static std::set<std::string> missingLibs;
 
 protected:
-    Library _lib;
     std::string classname;
     std::string testToRun;
     bool gcc_style_errors;
@@ -50,7 +48,6 @@ protected:
     bool prepareTest(const char testname[]);
 
     void assert_(const char *filename, unsigned int linenr, bool condition) const;
-    void todoAssert(const char *filename, unsigned int linenr, bool condition) const;
 
     void assertEquals(const char *filename, unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = emptyString) const;
     void assertEquals(const char *filename, unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg = emptyString) const;
@@ -97,6 +94,5 @@ extern std::ostringstream warnings;
 #else
 #define LOAD_LIB_2( LIB, NAME ) { if ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK) { complainMissingLib(NAME); return; } }
 #endif
-#define LOAD_LIB( NAME ) { LOAD_LIB_2(_lib, NAME); }
 
 #endif
diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index 2efcbb184..4e9de6f25 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -5,7 +5,6 @@
   <?define TranslationsDir = "..\gui" ?>
   <?define CfgsDir = "..\cfg" ?>
   <?define AddonsDir = "..\addons" ?>
-  <?define HelpDir = "..\gui\help" ?>
   <?define QtDllDir = "..\bin" ?>
 
   <?if $(var.Platform) = x64 ?>