diff --git a/src/engine/agent/Agent_Impl.cpp b/src/engine/agent/Agent_Impl.cpp
index 39f6070b..a4306a3d 100644
--- a/src/engine/agent/Agent_Impl.cpp
+++ b/src/engine/agent/Agent_Impl.cpp
@@ -337,7 +337,7 @@ void AgentImpl::processStartSession(Json::Value& request, Json::Value& answer)
         if (temp_path.size())
             config += " -fau " + temp_path;
 
-        MT::PSevanaAqua qc = std::make_shared<MT::SevanaAqua>();
+        auto qc = std::make_shared<sevana::aqua>();
         qc->setTempPath(temp_path);
         qc->configureWith(MT::SevanaAqua::parseConfig(config));
 
diff --git a/src/engine/agent/Agent_Impl.h b/src/engine/agent/Agent_Impl.h
index c4fbf8cf..a4749c5e 100644
--- a/src/engine/agent/Agent_Impl.h
+++ b/src/engine/agent/Agent_Impl.h
@@ -13,6 +13,8 @@
 #include "Agent_AudioManager.h"
 #include <mutex>
 #include <condition_variable>
+#include "aqua++.h"
+#include "pvqa++.h"
 
 class AgentImpl: public UserAgent
 #if defined(USE_AQUA_LIBRARY)
@@ -34,7 +36,7 @@ protected:
 
 #if defined(USE_AQUA_LIBRARY)
   // Keys are the same as used in mSessionMap
-  typedef std::map<int, MT::PSevanaAqua> AquaMap;
+  typedef std::map<int, std::shared_ptr<sevana::aqua> AquaMap;
   AquaMap mAquaMap;
   ByteBuffer mAquaIncoming, mAquaOutgoing;
 #endif