diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index 35bbde9b3..8e82790d2 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -401,12 +401,12 @@ int snprintf(char* buf, int len, char const* fmt, ...)
 #ifdef  __GLIBC__
 #define TORRENT_EXCEPTION_THROW_SPECIFIER _GLIBCXX_USE_NOEXCEPT
 #else
-
 #if __cplusplus <= 199711L || defined BOOST_NO_CXX11_NOEXCEPT
 #define TORRENT_EXCEPTION_THROW_SPECIFIER throw()
 #else
 #define TORRENT_EXCEPTION_THROW_SPECIFIER noexcept
 #endif
+#endif // __GLIBC__
 
 #if __cplusplus <= 199711L || defined BOOST_NO_CXX11_FINAL
 #define TORRENT_FINAL
@@ -420,9 +420,6 @@ int snprintf(char* buf, int len, char const* fmt, ...)
 #define TORRENT_OVERRIDE override
 #endif
 
-
-#endif // __GLIBC__
-
 #ifndef TORRENT_ICONV_ARG
 #define TORRENT_ICONV_ARG (char**)
 #endif
diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp
index 61b595e48..201449eab 100644
--- a/include/libtorrent/tracker_manager.hpp
+++ b/include/libtorrent/tracker_manager.hpp
@@ -33,14 +33,16 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_TRACKER_MANAGER_HPP_INCLUDED
 #define TORRENT_TRACKER_MANAGER_HPP_INCLUDED
 
+#include "libtorrent/config.hpp"
+
+#include "aux_/disable_warnings_push.hpp"
+
 #include <vector>
 #include <string>
 #include <list>
 #include <utility>
 #include <ctime>
 
-#include "aux_/disable_warnings_push.hpp"
-
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/cstdint.hpp>
@@ -54,7 +56,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "aux_/disable_warnings_pop.hpp"
 
-#include "libtorrent/config.hpp"
 #include "libtorrent/socket.hpp"
 #include "libtorrent/address.hpp"
 #include "libtorrent/peer_id.hpp"