diff --git a/src/CLI.cpp b/src/CLI.cpp
index 80b86d074..2b558e6e4 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -28,12 +28,17 @@
 #include <iostream>
 #include <Context.h>
 #include <CLI.h>
+#include <util.h>
 #include <i18n.h>
 
 extern Context context;
 
 ////////////////////////////////////////////////////////////////////////////////
 CLI::CLI ()
+: _program ("")
+, _rc ("")
+, _command ("")
+, _readOnly (false)
 {
 }
 
diff --git a/src/CLI.h b/src/CLI.h
index e9dacde92..9750dfd6f 100644
--- a/src/CLI.h
+++ b/src/CLI.h
@@ -38,10 +38,13 @@ public:
   void alias (const std::string&, const std::string&);
   void entity (const std::string&, const std::string&);
   void initialize (int, const char**);
+  void aliasExpansion ();
+  void categorize ();
+  bool exactMatch (const std::string&, const std::string&) const;
+  bool canonicalize (std::string&, const std::string&, const std::string&) const;
 
 private:
   void extractOverrides ();
-  void aliasExpansion ();
   void dump (const std::string&) const;
 
 public:
@@ -51,6 +54,11 @@ public:
   std::vector <std::string>                _args;
   std::string                              _rc;
   std::map <std::string, std::string>      _overrides;
+
+  std::string                              _command;
+  bool                                     _readOnly;
+  std::vector <std::string>                _filter;
+  std::vector <std::string>                _modifications;
 };
 
 #endif