Clean up #includes.

test/module/credit_card_example.cpp

@@ -25,7 +25,11 @@ import std.core;
 #include <iostream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 
 bool validate_card_format(const std::string& s)

test/module/partial_regex_grep.cpp

@@ -28,7 +28,11 @@ import std.core;
 #include <cstring>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 // match some kind of html tag:
 boost::regex e("<[^>]*>");

test/module/partial_regex_iterate.cpp

@@ -28,7 +28,11 @@ import std.core;
 #include <cstring>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 #ifdef BOOST_NO_STDC_NAMESPACE
 namespace std{ using ::memmove; }

test/module/partial_regex_match.cpp

@@ -28,7 +28,11 @@ import std.core;
 #include <iostream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 boost::regex e("(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})");
 

test/module/regex_grep_example_1.cpp

@@ -28,7 +28,11 @@ import std.core;
 
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 // purpose:
 // takes the contents of a file in the form of a string

test/module/regex_grep_example_2.cpp

@@ -28,7 +28,11 @@ import std.core;
 #include <iostream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 // purpose:
 // takes the contents of a file in the form of a string

test/module/regex_grep_example_3.cpp

@@ -29,7 +29,11 @@ import std.core;
 #include <fstream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 // purpose:
 // takes the contents of a file in the form of a string

test/module/regex_iterator_example.cpp

@@ -29,7 +29,11 @@ import std.core;
 #include <algorithm>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 using namespace std;
 

test/module/regex_match_example.cpp

@@ -27,7 +27,11 @@ import std.core;
 #include <iostream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 using namespace std;
 using namespace boost;

test/module/regex_merge_example.cpp

@@ -31,7 +31,11 @@ import std.core;
 #include <iostream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 // purpose:
 // takes the contents of a file and transform to

test/module/regex_replace_example.cpp

@@ -31,7 +31,11 @@ import std.core;
 #include <iostream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 // purpose:
 // takes the contents of a file and transform to

test/module/regex_search_example.cpp

@@ -27,7 +27,11 @@ import std.core;
 #include <fstream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 // purpose:
 // takes the contents of a file in the form of a string

test/module/regex_split_example_1.cpp

@@ -27,7 +27,11 @@ import std.core;
 #include <iostream>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 unsigned tokenise(std::list<std::string>& l, std::string& s)
 {

test/module/regex_split_example_2.cpp

@@ -28,7 +28,11 @@ import std.core;
 #include <iterator>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
                boost::regex::normal | boost::regex::icase);

test/module/regex_token_iterator_eg_1.cpp

@@ -26,7 +26,11 @@ import std.core;
 #include <string>
 #endif
 
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 using namespace std;
 

test/module/regex_token_iterator_eg_2.cpp

@@ -16,8 +16,11 @@
   *   DESCRIPTION: regex_token_iterator example: spit out linked URL's.
   */
 
-
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
 import boost.regex;
+#endif
 
 #ifdef __cpp_lib_modules
 import std;
@@ -28,7 +31,6 @@ import std.core;
 #include <iostream>
 #include <iterator>
 #endif
-
 boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
                boost::regex::normal | boost::regex::icase);