some header file cleanup

Author: Daniel Kroening

src/cbmc/all_properties.cpp

@@ -6,6 +6,21 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include <iostream>
+
+#include <util/time_stopping.h>
+#include <util/xml.h>
+#include <util/json.h>
+
+#include <solvers/sat/satcheck.h>
+#include <solvers/prop/literal_expr.h>
+
+#include <goto-symex/build_goto_trace.h>
+#include <goto-programs/xml_goto_trace.h>
+#include <goto-programs/json_goto_trace.h>
+
+#include "bv_cbmc.h"
+
 #include "all_properties_class.h"
 
 /*******************************************************************\

src/cbmc/all_properties_class.h

@@ -6,22 +6,9 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#include <iostream>
-
-#include <util/time_stopping.h>
-#include <util/xml.h>
-#include <util/json.h>
-
-#include <solvers/sat/satcheck.h>
 #include <solvers/prop/cover_goals.h>
-#include <solvers/prop/literal_expr.h>
-
-#include <goto-symex/build_goto_trace.h>
-#include <goto-programs/xml_goto_trace.h>
-#include <goto-programs/json_goto_trace.h>
 
 #include "bmc.h"
-#include "bv_cbmc.h"
 
 /*******************************************************************\
 

src/cbmc/fault_localization.cpp

@@ -12,10 +12,13 @@ Author: Peter Schrammel
 #include <util/symbol.h>
 #include <util/std_expr.h>
 #include <util/message.h>
+#include <util/time_stopping.h>
 
 #include <solvers/prop/minimize.h>
 #include <solvers/prop/literal_expr.h>
 
+#include <goto-symex/build_goto_trace.h>
+
 #include "fault_localization.h"
 #include "counterexample_beautification.h"