diff --git a/client/clientConnection.cpp b/client/clientConnection.cpp
index 23610b9e..a42678fc 100644
--- a/client/clientConnection.cpp
+++ b/client/clientConnection.cpp
@@ -19,7 +19,7 @@
 #include <iostream>
 #include <mutex>
 #include "clientConnection.h"
-#include "common/utils.h"
+#include "common/compat.h"
 #include "common/snapException.h"
 #include "message/hello.h"
 #include "common/log.h"
@@ -57,7 +57,7 @@ void ClientConnection::socketRead(void* _to, size_t _bytes)
 void ClientConnection::start()
 {
 	tcp::resolver resolver(io_service_);
-	tcp::resolver::query query(tcp::v4(), host_, utl::to_string(port_), asio::ip::resolver_query_base::numeric_service);
+	tcp::resolver::query query(tcp::v4(), host_, cpt::to_string(port_), asio::ip::resolver_query_base::numeric_service);
 	auto iterator = resolver.resolve(query);
 	logO << "Connecting\n";
 	socket_.reset(new tcp::socket(io_service_));
diff --git a/message/sampleFormat.cpp b/message/sampleFormat.cpp
index 384f6a1d..1b6e71d2 100644
--- a/message/sampleFormat.cpp
+++ b/message/sampleFormat.cpp
@@ -21,6 +21,7 @@
 #include <sstream>
 
 #include "sampleFormat.h"
+#include "common/compat.h"
 #include "common/utils.h"
 #include "common/log.h"
 
@@ -61,9 +62,9 @@ void SampleFormat::setFormat(const std::string& format)
 	strs = split(format, ':');
 	if (strs.size() == 3)
 		setFormat(
-		    utl::stoul(strs[0]),
-		    utl::stoul(strs[1]),
-		    utl::stoul(strs[2]));
+		    cpt::stoul(strs[0]),
+		    cpt::stoul(strs[1]),
+		    cpt::stoul(strs[2]));
 }