M util/epist/keytree.cc → util/epist/keytree.cc

@@ -22,6 +22,11 @@ // DEALINGS IN THE SOFTWARE.
 
 #include "keytree.hh"
 
+#include <string>
+
+using std::string;
+
+
 keytree::keytree(Display *display) : _display(display)
 {
   _head = new keynode;

M util/epist/parser.cc → util/epist/parser.cc

@@ -1,10 +1,16 @@ 
 extern "C" {
 #include <stdio.h>
 }
+
 #include "parser.hh"
 
+#include <string>
+
+using std::string;
+
+
 parser::parser(keytree *kt)
-    : _mask(0), _action(Action::noaction), _key(""), _arg(""), _kt(kt)
+    : _kt(kt), _mask(0), _action(Action::noaction), _key(""), _arg("") 
 {
 }
 

M util/epist/parser.hh → util/epist/parser.hh

@@ -1,6 +1,7 @@ 
-#include <string>
 #include "actions.hh"
 #include "keytree.hh"
+
+#include <string>
 
 class parser {
 public: