diff --git a/src/Context.cpp b/src/Context.cpp
index 6e56ba20c..dfaacdad0 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <Context.h>
+#include <Parser.h> // TODO Remove
 #include <Directory.h>
 #include <File.h>
 #include <Eval.h>
@@ -159,6 +160,7 @@ int Context::initialize (int argc, const char** argv)
     Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive");
     Variant::searchUsingRegex    = config.getBoolean ("regex");
 
+    Parser parser;
     parser.initialize (argc, argv);                 // task arg0 arg1 ...
 
     // Process 'rc:<file>' command line override.
diff --git a/src/Context.h b/src/Context.h
index d38d0c25a..68bd3d4e9 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -37,7 +37,6 @@
 #include <Path.h>
 #include <File.h>
 #include <Directory.h>
-#include <Parser.h>
 #include <CLI.h>
 #include <Timer.h>
 
@@ -85,7 +84,6 @@ private:
 
 public:
   std::string                         program;
-  Parser                              parser;
   CLI                                 cli;
   std::string                         home_dir;
   File                                rc_file;