diff --git a/Subtrees/websocket/src/rng/boost_rng.hpp b/Subtrees/websocket/src/rng/boost_rng.hpp
index 8069937080..c87c20e54d 100644
--- a/Subtrees/websocket/src/rng/boost_rng.hpp
+++ b/Subtrees/websocket/src/rng/boost_rng.hpp
@@ -30,7 +30,9 @@
 #ifndef BOOST_RNG_HPP
 #define BOOST_RNG_HPP
 
-#define __STDC_LIMIT_MACROS 1
+#ifndef __STDC_LIMIT_MACROS
+  #define __STDC_LIMIT_MACROS
+#endif
 #include <stdint.h>
 
 #include <boost/random.hpp>
diff --git a/modules/ripple_websocket/ripple_websocket.h b/modules/ripple_websocket/ripple_websocket.h
index 0e3b7fb1b1..4eeb8c78ce 100644
--- a/modules/ripple_websocket/ripple_websocket.h
+++ b/modules/ripple_websocket/ripple_websocket.h
@@ -21,6 +21,10 @@
     @deprecated
 */
 
+// needed before inclusion of stdint.h for INT32_MIN/INT32_MAX macros
+#ifndef __STDC_LIMIT_MACROS
+  #define __STDC_LIMIT_MACROS
+#endif
 
 // VFALCO NOTE Log dependencies have wormed their way into websocketpp,
 //             which needs the ripple_basic module to compile.
@@ -38,11 +42,6 @@
 
 //------------------------------------------------------------------------------
 
-// VFALCO TODO This include is just to prevent a warning about
-//             redefinition of __STDC_LIMIT_MACROS. Fix it right.
-//
-#include "websocket/src/rng/boost_rng.hpp"
-
 #include "websocket/src/common.hpp"
 #include "websocket/src/sockets/socket_base.hpp"