diff --git a/src/common.hpp b/src/common.hpp
index 5b2bd12a08..e94ee40ae1 100644
--- a/src/common.hpp
+++ b/src/common.hpp
@@ -28,6 +28,7 @@
 #ifndef WEBSOCKET_CONSTANTS_HPP
 #define WEBSOCKET_CONSTANTS_HPP
 
+#define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #include <string>
diff --git a/src/endpoint.hpp b/src/endpoint.hpp
index 04486c6193..2042dc2307 100644
--- a/src/endpoint.hpp
+++ b/src/endpoint.hpp
@@ -28,13 +28,13 @@
 #ifndef WEBSOCKETPP_ENDPOINT_HPP
 #define WEBSOCKETPP_ENDPOINT_HPP
 
-#include <boost/asio.hpp>
-#include <boost/shared_ptr.hpp>
-
 #include "connection.hpp"
 #include "sockets/plain.hpp" // should this be here?
 #include "logger/logger.hpp"
 
+#include <boost/asio.hpp>
+#include <boost/shared_ptr.hpp>
+
 #include <iostream>
 #include <set>
 
diff --git a/src/roles/client.hpp b/src/roles/client.hpp
index 001c6c18fc..232201de42 100644
--- a/src/roles/client.hpp
+++ b/src/roles/client.hpp
@@ -38,6 +38,7 @@
 #include <boost/random/random_device.hpp>
 
 #include <iostream>
+#define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 using boost::asio::ip::tcp;