diff --git a/include/modbuspp/data.h b/include/modbuspp/data.h
index 49aca7c..86cffa5 100644
--- a/include/modbuspp/data.h
+++ b/include/modbuspp/data.h
@@ -22,6 +22,7 @@
 #include <type_traits>
 #include <limits>
 #include <string>
+#include <stdexcept>
 
 #include <modbuspp/global.h>
 #include <modbuspp/swap.h>
diff --git a/src/server.cpp b/src/server.cpp
index f975f54..84ea9c4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -423,7 +423,7 @@ namespace Modbus {
 
   // ---------------------------------------------------------------------------
   // static
-  void * Server::Private::loop (std::future<void> run, Private * d) {
+  void Server::Private::loop (std::future<void> run, Private * d) {
     int rc;
 
     while (run.wait_for (std::chrono::milliseconds (100)) == std::future_status::timeout) {
diff --git a/src/server_p.h b/src/server_p.h
index 616a7ea..cd500d7 100644
--- a/src/server_p.h
+++ b/src/server_p.h
@@ -39,7 +39,7 @@ namespace Modbus {
 
       BufferedSlave * addSlave (int slaveAddr, Device * master);
 
-      static void * loop (std::future<void> run, Private * d);
+      static void loop (std::future<void> run, Private * d);
       static int receive (Private * d);
 
       int sock;