Requirements: Re-order #include statements

14 files changed, 47 insertions, 45 deletions

diff --git a/Carpet/Requirements/src/Requirements.cc b/Carpet/Requirements/src/Requirements.cc
index 235acfa04..8375e5ab8 100644
--- a/Carpet/Requirements/src/Requirements.cc
+++ b/Carpet/Requirements/src/Requirements.cc
@@ -1,20 +1,19 @@
-#include <Requirements.hh>
+#include "Requirements.hh"
+#include "all_clauses.hh"
+#include "all_state.hh"
+#include "gridpoint.hh"
+#include "util.hh"
 
 #include <cctk.h>
 #include <cctk_Parameters.h>
 #include <cctk_Schedule.h>
-
 #include <util_String.h>
 
+#include <cstdlib>
 #include <iostream>
 #include <vector>
 #include <cstdlib>
 
-#include <all_clauses.hh>
-#include <util.hh>
-#include <gridpoint.hh>
-#include <all_state.hh>
-
 using namespace std;
 
 namespace Requirements {
diff --git a/Carpet/Requirements/src/all_clauses.cc b/Carpet/Requirements/src/all_clauses.cc
index 179a411a3..5b19f3f52 100644
--- a/Carpet/Requirements/src/all_clauses.cc
+++ b/Carpet/Requirements/src/all_clauses.cc
@@ -1,12 +1,12 @@
-#include <iostream>
-#include <map>
-#include <vector>
+#include "all_clauses.hh"
+#include "util.hh"
 
 #include <cctk.h>
 #include <cctki_Schedule.h>
 
-#include <all_clauses.hh>
-#include <util.hh>
+#include <iostream>
+#include <map>
+#include <vector>
 
 using namespace std;
 
diff --git a/Carpet/Requirements/src/all_clauses.hh b/Carpet/Requirements/src/all_clauses.hh
index ceedc330b..a73ce2c90 100644
--- a/Carpet/Requirements/src/all_clauses.hh
+++ b/Carpet/Requirements/src/all_clauses.hh
@@ -1,14 +1,14 @@
 #ifndef ALL_CLAUSES_HH
 #define ALL_CLAUSES_HH
 
+#include "clauses.hh"
+
 #include <cctk.h>
 #include <cctki_Schedule.h>
 
 #include <iostream>
 #include <map>
 
-#include <clauses.hh>
-
 namespace Requirements {
   
   using namespace std;
diff --git a/Carpet/Requirements/src/all_state.cc b/Carpet/Requirements/src/all_state.cc
index 19fa0c1eb..6b1b53370 100644
--- a/Carpet/Requirements/src/all_state.cc
+++ b/Carpet/Requirements/src/all_state.cc
@@ -1,10 +1,12 @@
+#include "all_clauses.hh"
+#include "all_state.hh"
+#include "clauses.hh"
+#include "util.hh"
+
 #include <cctk.h>
 #include <cctk_Parameters.h>
 
-#include <all_clauses.hh>
-#include <all_state.hh>
-#include <clauses.hh>
-#include <util.hh>
+#include <cstdlib>
 
 #include <cstdlib>
 
diff --git a/Carpet/Requirements/src/all_state.hh b/Carpet/Requirements/src/all_state.hh
index e6fa4e571..0782880cc 100644
--- a/Carpet/Requirements/src/all_state.hh
+++ b/Carpet/Requirements/src/all_state.hh
@@ -1,16 +1,15 @@
 #ifndef ALL_STATE_HH
 #define ALL_STATE_HH
 
-#include <iostream>
-#include <vector>
+#include "Requirements.hh"
+#include "all_clauses.hh"
+#include "gridpoint.hh"
 
 #include <cctk.h>
 #include <cctki_Schedule.h>
 
-#include <Requirements.hh>
-
-#include <all_clauses.hh>
-#include <gridpoint.hh>
+#include <iostream>
+#include <vector>
 
 using namespace std;
 
diff --git a/Carpet/Requirements/src/clause.cc b/Carpet/Requirements/src/clause.cc
index 17825c891..e36dd5693 100644
--- a/Carpet/Requirements/src/clause.cc
+++ b/Carpet/Requirements/src/clause.cc
@@ -1,3 +1,6 @@
+#include "clause.hh"
+#include "util.hh"
+
 #include <cctk.h>
 #include <cctki_Schedule.h>
 
@@ -5,9 +8,6 @@
 #include <cstring>
 #include <vector>
 
-#include <clause.hh>
-#include <util.hh>
-
 using namespace std;
 
 namespace Requirements {
diff --git a/Carpet/Requirements/src/clause.hh b/Carpet/Requirements/src/clause.hh
index 0e7822673..d75f8b359 100644
--- a/Carpet/Requirements/src/clause.hh
+++ b/Carpet/Requirements/src/clause.hh
@@ -1,6 +1,7 @@
 #ifndef CLAUSE_HH
 #define CLAUSE_HH
 
+#include <cctk.h>
 #include <cctk_Schedule.h>
 
 #include <vector>
diff --git a/Carpet/Requirements/src/clauses.cc b/Carpet/Requirements/src/clauses.cc
index 3628fab1d..a948ff3ad 100644
--- a/Carpet/Requirements/src/clauses.cc
+++ b/Carpet/Requirements/src/clauses.cc
@@ -1,12 +1,12 @@
-#include <iostream>
-#include <vector>
+#include "clause.hh"
+#include "clauses.hh"
+#include "util.hh"
 
 #include <cctk.h>
 #include <cctki_Schedule.h>
 
-#include <clause.hh>
-#include <clauses.hh>
-#include <util.hh>
+#include <iostream>
+#include <vector>
 
 using namespace std;
 
diff --git a/Carpet/Requirements/src/clauses.hh b/Carpet/Requirements/src/clauses.hh
index d5441c880..174bd9c0f 100644
--- a/Carpet/Requirements/src/clauses.hh
+++ b/Carpet/Requirements/src/clauses.hh
@@ -1,12 +1,12 @@
 #ifndef CLAUSES_HH
 #define CLAUSES_HH
 
-#include <iostream>
+#include "clause.hh"
 
 #include <cctk.h>
 #include <cctki_Schedule.h>
 
-#include <clause.hh>
+#include <iostream>
 
 namespace Requirements {
   
diff --git a/Carpet/Requirements/src/gridpoint.cc b/Carpet/Requirements/src/gridpoint.cc
index c351eec21..9aa5ce91a 100644
--- a/Carpet/Requirements/src/gridpoint.cc
+++ b/Carpet/Requirements/src/gridpoint.cc
@@ -1,10 +1,10 @@
+#include "gridpoint.hh"
+#include "util.hh"
+
 #include <cctk.h>
 #include <cctk_Parameters.h>
 
-#include <Requirements.hh>
-
-#include <gridpoint.hh>
-#include <util.hh>
+#include <cstdlib>
 
 #include <cstdlib>
 
diff --git a/Carpet/Requirements/src/gridpoint.hh b/Carpet/Requirements/src/gridpoint.hh
index 0db3257b3..94c4543e9 100644
--- a/Carpet/Requirements/src/gridpoint.hh
+++ b/Carpet/Requirements/src/gridpoint.hh
@@ -1,12 +1,12 @@
 #ifndef GRIDPOINT_HH
 #define GRIDPOINT_HH
 
-#include <iostream>
+#include "clause.hh"
+#include "location.hh"
 
 #include <cctk_Schedule.h>
 
-#include <clause.hh>
-#include <location.hh>
+#include <iostream>
 
 using namespace std;
 
diff --git a/Carpet/Requirements/src/location.cc b/Carpet/Requirements/src/location.cc
index d049d8cfd..885b5c051 100644
--- a/Carpet/Requirements/src/location.cc
+++ b/Carpet/Requirements/src/location.cc
@@ -1,9 +1,9 @@
-#include <cstdlib>
-#include <iostream>
+#include "location.hh"
 
 #include <cctk.h>
 
-#include <location.hh>
+#include <cstdlib>
+#include <iostream>
 
 namespace Requirements {
 
diff --git a/Carpet/Requirements/src/location.hh b/Carpet/Requirements/src/location.hh
index 18063846d..82b6d975e 100644
--- a/Carpet/Requirements/src/location.hh
+++ b/Carpet/Requirements/src/location.hh
@@ -1,6 +1,7 @@
 #ifndef LOCATION_HH
 #define LOCATION_HH
 
+#include <cctk.h>
 #include <cctk_Schedule.h>
 
 #include <iostream>
diff --git a/Carpet/Requirements/src/util.cc b/Carpet/Requirements/src/util.cc
index 3d8e16d0c..4e736cd1e 100644
--- a/Carpet/Requirements/src/util.cc
+++ b/Carpet/Requirements/src/util.cc
@@ -1 +1 @@
-#include <util.hh>
+#include "util.hh"