diff --git a/src/proc/mobject/session/query-resolver.cpp b/src/lib/query-resolver.cpp
similarity index 93%
rename from src/proc/mobject/session/query-resolver.cpp
rename to src/lib/query-resolver.cpp
index eeeef53ad..a8bac0e25 100644
--- a/src/proc/mobject/session/query-resolver.cpp
+++ b/src/lib/query-resolver.cpp
@@ -21,15 +21,11 @@
 * *****************************************************/
 
 
-#include "proc/mobject/session/query-resolver.hpp"
+#include "lib/query-resolver.hpp"
 #include "lib/multifact-arg.hpp"
 
-namespace proc {
-namespace mobject {
-namespace session {
+namespace lib {
   
-  using lib::factory::MultiFact;
-  using lib::factory::BuildRefcountPtr;
   
   
   /* generate vtables here... */
@@ -123,4 +119,4 @@ namespace session {
   
   
   
-}}} // namespace proc::mobject::session
+} // namespace lib
diff --git a/src/proc/mobject/session/query-resolver.hpp b/src/lib/query-resolver.hpp
similarity index 97%
rename from src/proc/mobject/session/query-resolver.hpp
rename to src/lib/query-resolver.hpp
index 9549083ef..bb6ec737e 100644
--- a/src/proc/mobject/session/query-resolver.hpp
+++ b/src/lib/query-resolver.hpp
@@ -43,13 +43,12 @@
 //using std::vector;
 //using std::string;
 
-namespace proc {
-namespace mobject {
-namespace session {
+namespace lib {
   
   using lib::IxID;
   using util::unConst;
   using boost::noncopyable;
+  using boost::lexical_cast;
   using boost::scoped_ptr;
   using std::tr1::function;
   using std::string;
@@ -185,7 +184,7 @@ namespace session {
         : Goal (defineQueryTypeID())
         { }
       
-      static QueryBuilder
+      static Builder
       build (Kind queryType = Goal::GENERIC);
       
       
@@ -239,7 +238,7 @@ namespace session {
       asKey()  const
         {
           return "type("
-               + lexial_cast<string> (getResultTypeID<RES>())
+               + lexical_cast<string> (getResultTypeID<RES>())
                + "), "+predicateForm_;
         }
       
@@ -357,5 +356,5 @@ namespace session {
   }
   
   
-}}} // namespace proc::mobject::session
+} // namespace lib
 #endif
diff --git a/src/lib/query.hpp b/src/lib/query.hpp
index 7d6d27e9e..c397050f6 100644
--- a/src/lib/query.hpp
+++ b/src/lib/query.hpp
@@ -26,6 +26,7 @@
 
 
 #include <string>
+#include <cctype>
 #include <typeinfo>
 
 #include "lib/symbol.hpp"
@@ -36,7 +37,6 @@ namespace lumiera {
   using lib::Symbol;
   using lib::Literal;
   using std::string;
-  using boost::format;
   
   /* ==== common definitions for rule based queries ==== */
   
diff --git a/src/proc/mobject/session/placement-index-query-resolver.hpp b/src/proc/mobject/session/placement-index-query-resolver.hpp
index b451e7c7e..426815f3f 100644
--- a/src/proc/mobject/session/placement-index-query-resolver.hpp
+++ b/src/proc/mobject/session/placement-index-query-resolver.hpp
@@ -57,9 +57,10 @@
 #define MOBJECT_SESSION_PLACEMENT_INDEX_QUERY_RESOLVER_H
 
 #include "proc/mobject/session/placement-index.hpp"
-#include "proc/mobject/session/query-resolver.hpp"
 #include "proc/mobject/session/scope-query.hpp"
 
+#include "lib/query.hpp"
+
 #include <tr1/functional>
 
 
diff --git a/src/proc/mobject/session/scope-query.hpp b/src/proc/mobject/session/scope-query.hpp
index 2614e8fd3..1369ce21e 100644
--- a/src/proc/mobject/session/scope-query.hpp
+++ b/src/proc/mobject/session/scope-query.hpp
@@ -43,7 +43,7 @@
 
 
 #include "proc/mobject/placement.hpp"
-#include "proc/mobject/session/query-resolver.hpp"
+#include "lib/query-resolver.hpp"
 
 #include <tr1/functional>
 
diff --git a/src/proc/mobject/session/session-service-explore-scope.hpp b/src/proc/mobject/session/session-service-explore-scope.hpp
index 10d483fba..302a69458 100644
--- a/src/proc/mobject/session/session-service-explore-scope.hpp
+++ b/src/proc/mobject/session/session-service-explore-scope.hpp
@@ -47,7 +47,7 @@
 #define MOBJECT_SESSION_SESSION_SERVICE_EXPLORE_SCOPE_H
 
 #include "proc/mobject/placement.hpp"
-#include "proc/mobject/session/query-resolver.hpp"
+#include "lib/query-resolver.hpp"
 
 
 
diff --git a/tests/components/proc/mobject/session/placement-index-query-test.cpp b/tests/components/proc/mobject/session/placement-index-query-test.cpp
index 84f0f6680..17f6b2a34 100644
--- a/tests/components/proc/mobject/session/placement-index-query-test.cpp
+++ b/tests/components/proc/mobject/session/placement-index-query-test.cpp
@@ -22,11 +22,11 @@
 
 
 #include "lib/test/run.hpp"
-#include "proc/mobject/session/query-resolver.hpp"
 #include "proc/mobject/session/scope-query.hpp"
 #include "proc/mobject/session/session-service-explore-scope.hpp"
 #include "proc/mobject/session/placement-index-query-resolver.hpp"
 #include "proc/mobject/session/test-scopes.hpp"
+#include "lib/query-resolver.hpp"
 #include "lib/util.hpp"
 
 #include <iostream>
diff --git a/tests/components/proc/mobject/session/query-resolver-test.cpp b/tests/components/proc/mobject/session/query-resolver-test.cpp
index df70b2cb7..2a57f8980 100644
--- a/tests/components/proc/mobject/session/query-resolver-test.cpp
+++ b/tests/components/proc/mobject/session/query-resolver-test.cpp
@@ -23,7 +23,7 @@
 
 #include "lib/test/run.hpp"
 #include "lib/test/test-helper.hpp"
-#include "proc/mobject/session/query-resolver.hpp"
+#include "lib/query-resolver.hpp"
 #include "lib/singleton.hpp"
 
 #include <iostream>