diff --git a/src/common.hpp b/src/common.hpp
index e94ee40ae1..bde85591d9 100644
--- a/src/common.hpp
+++ b/src/common.hpp
@@ -28,7 +28,9 @@
 #ifndef WEBSOCKET_CONSTANTS_HPP
 #define WEBSOCKET_CONSTANTS_HPP
 
-#define __STDC_LIMIT_MACROS
+#ifndef __STDC_LIMIT_MACROS
+  #define __STDC_LIMIT_MACROS
+#endif
 #include <stdint.h>
 
 #include <string>
diff --git a/src/roles/client.hpp b/src/roles/client.hpp
index 232201de42..be9f218605 100644
--- a/src/roles/client.hpp
+++ b/src/roles/client.hpp
@@ -31,6 +31,11 @@
 #include "../endpoint.hpp"
 #include "../uri.hpp"
 
+#ifndef __STDC_LIMIT_MACROS
+  #define __STDC_LIMIT_MACROS
+#endif
+#include <stdint.h>
+
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
@@ -38,8 +43,6 @@
 #include <boost/random/random_device.hpp>
 
 #include <iostream>
-#define __STDC_LIMIT_MACROS
-#include <stdint.h>
 
 using boost::asio::ip::tcp;