Fix include order in musketeer

src/musketeer/cycles_visitor.cpp

@@ -9,10 +9,11 @@ Author: Vincent Nimal
 /// \file
 /// cycles visitor for computing edges involved for fencing
 
+#include "cycles_visitor.h"
+
 #include <list>
 #include <map>
 
-#include "cycles_visitor.h"
 #include "fence_inserter.h"
 
 class instrumentert;

src/musketeer/fence_inserter.cpp

@@ -9,6 +9,8 @@ Author: Vincent Nimal
 /// \file
 /// ILP construction for all cycles and resolution
 
+#include "fence_inserter.h"
+
 #include <util/graph.h>
 
 #include <sstream>
@@ -19,7 +21,6 @@ Author: Vincent Nimal
 #include <cstdlib>
 #endif
 
-#include "fence_inserter.h"
 #include "ilp.h"
 
 class abstract_eventt;

src/musketeer/fence_shared.cpp

@@ -6,6 +6,7 @@ Author: Vincent Nimal
 
 \*******************************************************************/
 
+#include "fence_shared.h"
 
 #include <iostream>
 #include <sstream>
@@ -24,8 +25,6 @@ Author: Vincent Nimal
 #include <goto-instrument/rw_set.h>
 // #include <goto-instrument/nondet_volatile.h>
 
-#include "fence_shared.h"
-
 #ifdef LOCAL_MAY
 #include <analyses/local_may_alias.h>
 #endif

src/musketeer/fencer.cpp

@@ -9,6 +9,8 @@ Author: Vincent Nimal
 /// \file
 /// Fence inference: Main
 
+#include "fencer.h"
+
 #include <util/cprover_prefix.h>
 #include <util/message.h>
 
@@ -19,7 +21,6 @@ Author: Vincent Nimal
 #include "fence_inserter.h"
 #include "fence_user_def.h"
 #include "fence_assert.h"
-#include "fencer.h"
 
 void fence_weak_memory(
   memory_modelt model,

src/musketeer/graph_visitor.cpp

@@ -9,9 +9,10 @@ Author: Vincent Nimal
 /// \file
 /// graph visitor for computing edges involved for fencing
 
-#include "fence_inserter.h"
 #include "graph_visitor.h"
 
+#include "fence_inserter.h"
+
 /* implemented: BTWN1, BTWN4 */
 #define BTWN1
 

src/musketeer/languages.cpp

@@ -9,12 +9,12 @@ Author:
 /// \file
 /// Language Registration
 
+#include "musketeer_parse_options.h"
+
 #include <langapi/mode.h>
 
 #include <ansi-c/ansi_c_language.h>
 
-#include "musketeer_parse_options.h"
-
 void goto_fence_inserter_parse_optionst::register_languages()
 {
   register_language(new_ansi_c_language);

src/musketeer/musketeer_parse_options.cpp

@@ -9,6 +9,8 @@ Author:
 /// \file
 /// Main Module
 
+#include "musketeer_parse_options.h"
+
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -42,7 +44,6 @@ Author:
 
 #include "propagate_const_function_pointers.h"
 #include "version.h"
-#include "musketeer_parse_options.h"
 #include "fencer.h"
 #include "fence_shared.h"
 #include "pensieve.h"

src/musketeer/pensieve.cpp

@@ -6,6 +6,7 @@ Author: Vincent Nimal
 
 \*******************************************************************/
 
+#include "pensieve.h"
 
 #include <util/cprover_prefix.h>
 #include <util/namespace.h>
@@ -15,8 +16,6 @@ Author: Vincent Nimal
 #include <goto-instrument/rw_set.h>
 #include <goto-instrument/wmm/instrumenter_pensieve.h>
 
-#include "pensieve.h"
-
 void fence_pensieve(
   value_setst &value_sets,
   symbol_tablet &symbol_table,

src/musketeer/propagate_const_function_pointers.cpp

@@ -9,6 +9,8 @@ Author: Vincent Nimal
 /// \file
 /// Constant Function Pointer Propagation
 
+#include "propagate_const_function_pointers.h"
+
 #include <util/std_code.h>
 #include <util/std_expr.h>
 #include <util/std_types.h>
@@ -23,8 +25,6 @@ Author: Vincent Nimal
 #include <list>
 #include <cassert>
 
-#include "propagate_const_function_pointers.h"
-
 class const_function_pointer_propagationt
 {
 protected: