--- a/Core/RestApi/RestApiCall.h	Wed Jul 01 10:18:26 2015 +0200
+++ b/Core/RestApi/RestApiCall.h	Wed Jul 01 10:38:39 2015 +0200
@@ -32,7 +32,8 @@
 
 #pragma once
 
-#include "../HttpServer/HttpHandler.h"
+#include "../HttpServer/IHttpHandler.h"
+#include "../HttpServer/HttpToolbox.h"
 #include "RestApiPath.h"
 #include "RestApiOutput.h"
 
@@ -47,8 +48,8 @@
   private:
     RestApiOutput& output_;
     RestApi& context_;
-    const HttpHandler::Arguments& httpHeaders_;
-    const HttpHandler::Arguments& uriComponents_;
+    const IHttpHandler::Arguments& httpHeaders_;
+    const IHttpHandler::Arguments& uriComponents_;
     const UriComponents& trailing_;
     const UriComponents& fullUri_;
 
@@ -59,8 +60,8 @@
   public:
     RestApiCall(RestApiOutput& output,
                 RestApi& context,
-                const HttpHandler::Arguments& httpHeaders,
-                const HttpHandler::Arguments& uriComponents,
+                const IHttpHandler::Arguments& httpHeaders,
+                const IHttpHandler::Arguments& uriComponents,
                 const UriComponents& trailing,
                 const UriComponents& fullUri) :
       output_(output),
@@ -95,23 +96,23 @@
     std::string GetUriComponent(const std::string& name,
                                 const std::string& defaultValue) const
     {
-      return HttpHandler::GetArgument(uriComponents_, name, defaultValue);
+      return HttpToolbox::GetArgument(uriComponents_, name, defaultValue);
     }
 
     std::string GetHttpHeader(const std::string& name,
                               const std::string& defaultValue) const
     {
-      return HttpHandler::GetArgument(httpHeaders_, name, defaultValue);
+      return HttpToolbox::GetArgument(httpHeaders_, name, defaultValue);
     }
 
-    const HttpHandler::Arguments& GetHttpHeaders() const
+    const IHttpHandler::Arguments& GetHttpHeaders() const
     {
       return httpHeaders_;
     }
 
-    void ParseCookies(HttpHandler::Arguments& result) const
+    void ParseCookies(IHttpHandler::Arguments& result) const
     {
-      HttpHandler::ParseCookies(result, httpHeaders_);
+      HttpToolbox::ParseCookies(result, httpHeaders_);
     }
 
     std::string FlattenUri() const;