include order cleanup

Author: Daniel Kroening

src/goto-instrument/wmm/shared_buffers.cpp

@@ -6,14 +6,12 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#include <util/c_types.h>
-
 #include "shared_buffers.h"
-
 #include "fence.h"
-
 #include "../rw_set.h"
 
+#include <util/c_types.h>
+
 /// returns a unique id (for fresh variables)
 std::string shared_bufferst::unique(void)
 {

src/goto-programs/remove_asm.cpp

@@ -16,8 +16,8 @@ Date:   December 2014
 
 #include <sstream>
 
-#include <util/std_expr.h>
 #include <util/c_types.h>
+#include <util/std_expr.h>
 
 #include <ansi-c/string_constant.h>
 #include <assembler/assembler_parser.h>

src/goto-programs/remove_exceptions.cpp

@@ -20,8 +20,8 @@ Date:   December 2016
 #include <stack>
 #include <algorithm>
 
-#include <util/std_expr.h>
 #include <util/c_types.h>
+#include <util/std_expr.h>
 #include <util/symbol_table.h>
 
 class remove_exceptionst

src/goto-programs/remove_virtual_functions.cpp

@@ -10,13 +10,12 @@ Author: Daniel Kroening, [email protected]
 /// Remove Virtual Function (Method) Calls
 
 #include "remove_virtual_functions.h"
+#include "class_hierarchy.h"
+#include "class_identifier.h"
 
+#include <util/c_types.h>
 #include <util/prefix.h>
 #include <util/type_eq.h>
-#include <util/c_types.h>
-
-#include "class_hierarchy.h"
-#include "class_identifier.h"
 
 class remove_virtual_functionst
 {

src/java_bytecode/java_bytecode_convert_class.cpp

@@ -20,9 +20,9 @@ Author: Daniel Kroening, [email protected]
 #include "java_bytecode_convert_method.h"
 #include "java_bytecode_language.h"
 
+#include <util/c_types.h>
 #include <util/namespace.h>
 #include <util/std_expr.h>
-#include <util/c_types.h>
 
 #include <linking/zero_initializer.h>
 

src/java_bytecode/java_bytecode_convert_method.cpp

@@ -9,30 +9,29 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// JAVA Bytecode Language Conversion
 
-#include "java_bytecode_convert_method.h"
-
 #ifdef DEBUG
 #include <iostream>
 #endif
 
-#include <util/namespace.h>
-#include <util/std_expr.h>
-#include <util/string2int.h>
-#include <util/prefix.h>
+#include "java_bytecode_convert_method.h"
+#include "java_bytecode_convert_method_class.h"
+#include "bytecode_info.h"
+#include "java_types.h"
+
 #include <util/arith_tools.h>
+#include <util/c_types.h>
 #include <util/ieee_float.h>
+#include <util/namespace.h>
+#include <util/prefix.h>
 #include <util/simplify_expr.h>
-#include <util/c_types.h>
+#include <util/std_expr.h>
+#include <util/string2int.h>
 
 #include <linking/zero_initializer.h>
 
 #include <goto-programs/cfg.h>
 #include <analyses/cfg_dominators.h>
 
-#include "java_bytecode_convert_method_class.h"
-#include "bytecode_info.h"
-#include "java_types.h"
-
 #include <limits>
 #include <algorithm>
 #include <functional>

src/solvers/smt2/smt2_conv.cpp

@@ -14,16 +14,16 @@ Author: Daniel Kroening, [email protected]
 #include <cassert>
 
 #include <util/arith_tools.h>
+#include <util/base_type.h>
+#include <util/c_types.h>
 #include <util/expr_util.h>
-#include <util/std_types.h>
-#include <util/std_expr.h>
 #include <util/fixedbv.h>
-#include <util/pointer_offset_size.h>
 #include <util/ieee_float.h>
-#include <util/base_type.h>
-#include <util/string2int.h>
 #include <util/invariant.h>
-#include <util/c_types.h>
+#include <util/pointer_offset_size.h>
+#include <util/std_types.h>
+#include <util/std_expr.h>
+#include <util/string2int.h>
 
 #include <ansi-c/string_constant.h>