diff --git a/test/test_windows_headers.cpp b/test/test_windows_headers.cpp
index 64524d19..e3731b2e 100644
--- a/test/test_windows_headers.cpp
+++ b/test/test_windows_headers.cpp
@@ -10,18 +10,14 @@
 
 #define BOOST_TEST_MODULE test_windows_headers
 
-#ifdef _WIN32
+#include <boost/config.hpp> 
+#ifdef BOOST_WINDOWS
 #include <windows.h>
 #endif
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp> // Extra test tool for FP comparison.
 
-using namespace boost;
-namespace ut = boost::unit_test;
-using namespace boost::test_tools;
-
-
 BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( test, 2 )
 
 BOOST_AUTO_TEST_CASE( test )