diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index fc544593c..e71cd0c1e 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -50,8 +50,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #ifndef _MSC_VER
-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
+#define __STDC_FORMAT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
+#include <inttypes.h> // for PRId64 et.al.
+#include <stdint.h> // for INT64_MAX
 #endif
 
 #ifndef PRId64
diff --git a/src/utp_stream.cpp b/src/utp_stream.cpp
index 69d3334b8..a61687f82 100644
--- a/src/utp_stream.cpp
+++ b/src/utp_stream.cpp
@@ -30,6 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#include "libtorrent/config.hpp"
 #include "libtorrent/utp_stream.hpp"
 #include "libtorrent/sliding_average.hpp"
 #include "libtorrent/utp_socket_manager.hpp"