More include simplifications

include/internal/catch_commandline.hpp

@@ -13,6 +13,7 @@
 #include "catch_clara.h"
 
 #include <fstream>
+#include <ctime>
 
 namespace Catch {
 

include/internal/catch_config.hpp

@@ -16,8 +16,6 @@
 #include <memory>
 #include <vector>
 #include <string>
-#include <iostream>
-#include <ctime>
 #include <stdexcept>
 
 #ifndef CATCH_CONFIG_CONSOLE_WIDTH

include/internal/catch_debugger.hpp

@@ -11,8 +11,6 @@
 
 #include "catch_debugger.h"
 
-#include <iostream>
-
 #ifdef CATCH_PLATFORM_MAC
 
     #include <assert.h>

include/internal/catch_interfaces_config.h

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
 
-#include <iostream>
+#include <iosfwd>
 #include <string>
 #include <vector>
 

include/internal/catch_interfaces_reporter.h

@@ -21,7 +21,6 @@
 #include <string>
 #include <ostream>
 #include <map>
-#include <assert.h>
 
 namespace Catch
 {

include/internal/catch_notimplemented_exception.h

@@ -9,7 +9,6 @@
 #define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
 
 #include "catch_common.h"
-#include <ostream>
 
 namespace Catch {
 

include/internal/catch_notimplemented_exception.hpp

@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED
 
 #include "catch_notimplemented_exception.h"
-#include <ostream>
+#include <sstream>
 
 namespace Catch {
 

include/internal/catch_section.hpp

@@ -11,7 +11,6 @@
 #include "catch_section.h"
 #include "catch_capture.hpp"
 #include "catch_compiler_capabilities.h"
-#include "catch_timer.h"
 
 namespace Catch {
 

include/internal/catch_section_info.h

@@ -11,6 +11,8 @@
 #include "catch_common.h"
 #include "catch_totals.hpp"
 
+#include <string>
+
 namespace Catch {
 
     struct SectionInfo {

include/internal/catch_section_info.hpp

@@ -8,10 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED
 
-#include "catch_common.h"
-
-#include <map>
-#include <string>
+#include "catch_section_info.h"
 
 namespace Catch {
 

include/internal/catch_test_case_registry_impl.hpp

@@ -16,7 +16,6 @@
 #include <vector>
 #include <set>
 #include <sstream>
-#include <iostream>
 #include <algorithm>