diff --git a/src/navigate/commandprocessor.cpp b/src/navigate/commandprocessor.cpp
index 59f4f7b..a82563c 100644
--- a/src/navigate/commandprocessor.cpp
+++ b/src/navigate/commandprocessor.cpp
@@ -18,8 +18,10 @@
 #define BOOST_SPIRIT_UNICODE
 
 #include "commandprocessor.hpp"
-//TODO: trim #includes
-#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/include/qi_core.hpp>
+#include <boost/spirit/include/qi_parse.hpp>
+#include <boost/spirit/include/qi_grammar.hpp>
+#include <boost/spirit/include/qi_lexeme.hpp>
 #include <boost/fusion/adapted/struct.hpp>
 #include <boost/phoenix/phoenix.hpp>
 #include <ciso646>
diff --git a/src/navigate/genericpath.cpp b/src/navigate/genericpath.cpp
index 0c872e4..a796539 100644
--- a/src/navigate/genericpath.cpp
+++ b/src/navigate/genericpath.cpp
@@ -17,8 +17,11 @@
 
 #include "genericpath.hpp"
 #include "helpers/infix_iterator.hpp"
-//TODO: trim #includes
-#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/include/qi_core.hpp>
+#include <boost/spirit/include/qi_parse.hpp>
+#include <boost/spirit/include/qi_lit.hpp>
+#include <boost/spirit/include/qi_char_.hpp>
+#include <boost/spirit/include/qi_grammar.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <sstream>
 #include <boost/phoenix/bind/bind_function.hpp>