Remove unnecessary includes of json_expr.h

peterschrammel · peterschrammel · commit b8d311fe6597 · 2018-04-22T13:30:55.000+01:00
diff --git a/src/cbmc/bmc_cover.cpp b/src/cbmc/bmc_cover.cpp
@@ -18,7 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/xml_expr.h>
 #include <util/json.h>
 #include <util/json_stream.h>
-#include <util/json_expr.h>
 
 #include <solvers/prop/cover_goals.h>
 #include <solvers/prop/literal_expr.h>
diff --git a/src/cbmc/show_vcc.cpp b/src/cbmc/show_vcc.cpp
@@ -18,7 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <langapi/language_util.h>
 
 #include <util/json.h>
-#include <util/json_expr.h>
 
 void bmct::show_vcc_plain(std::ostream &out)
 {
diff --git a/src/goto-analyzer/static_simplifier.cpp b/src/goto-analyzer/static_simplifier.cpp
@@ -6,16 +6,15 @@ Author: Martin Brain, martin.brain@cs.ox.ac.uk
 
 \*******************************************************************/
 
+#include "static_simplifier.h"
+
 #include <goto-programs/remove_skip.h>
 #include <goto-programs/remove_unreachable.h>
 #include <goto-programs/write_goto_binary.h>
 
 #include <util/xml.h>
 #include <util/xml_expr.h>
 #include <util/json.h>
-#include <util/json_expr.h>
-
-#include "static_simplifier.h"
 
 
 /// Simplifies the program using the information in the abstract domain.
diff --git a/src/goto-instrument/unwind.h b/src/goto-instrument/unwind.h
@@ -14,7 +14,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #define CPROVER_GOTO_INSTRUMENT_UNWIND_H
 
 #include <util/json.h>
-#include <util/json_expr.h>
 #include <goto-programs/goto_model.h>
 
 class goto_modelt;
diff --git a/src/goto-programs/goto_inline_class.h b/src/goto-programs/goto_inline_class.h
@@ -14,7 +14,6 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/message.h>
 #include <util/json.h>
-#include <util/json_expr.h>
 
 #include "goto_functions.h"
 
diff --git a/src/goto-programs/json_goto_trace.cpp b/src/goto-programs/json_goto_trace.cpp
@@ -14,7 +14,6 @@ Author: Daniel Kroening
 #include "json_goto_trace.h"
 #include "goto_trace.h"
 
-#include <util/json_expr.h>
 #include <util/json.h>
 #include <util/json_stream.h>
 #include <util/arith_tools.h>
diff --git a/src/goto-programs/json_goto_trace.h b/src/goto-programs/json_goto_trace.h
@@ -18,7 +18,6 @@ Date: November 2005
 
 #include <util/json.h>
 #include <util/json_stream.h>
-#include <util/json_expr.h>
 #include <util/invariant.h>
 
 #include <langapi/mode.h>
diff --git a/src/goto-programs/show_goto_functions.cpp b/src/goto-programs/show_goto_functions.cpp
@@ -15,7 +15,6 @@ Author: Peter Schrammel
 
 #include <util/xml.h>
 #include <util/json.h>
-#include <util/json_expr.h>
 #include <util/xml_expr.h>
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
diff --git a/src/goto-programs/show_goto_functions_json.cpp b/src/goto-programs/show_goto_functions_json.cpp
@@ -14,7 +14,6 @@ Author: Thomas Kiley
 #include <iostream>
 #include <sstream>
 
-#include <util/json_expr.h>
 #include <util/json_irep.h>
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
diff --git a/src/goto-programs/show_properties.cpp b/src/goto-programs/show_properties.cpp
@@ -16,7 +16,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/xml.h>
 #include <util/xml_expr.h>
 #include <util/json.h>
-#include <util/json_expr.h>
 
 #include <langapi/language_util.h>
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ Author: Daniel Kroening, [email protected]`
`18`	`18`	`#include <langapi/language_util.h>`
`19`	`19`
`20`	`20`	`#include <util/json.h>`
`21`		`-#include <util/json_expr.h>`
`22`	`21`
`23`	`22`	`void bmct::show_vcc_plain(std::ostream &out)`
`24`	`23`	`{`