core.h: remove some #include lines, move some others to more localised

places.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3745

diff --git a/coregrind/amd64/core_arch.h b/coregrind/amd64/core_arch.h
index cae7b2341055501dc20ad644375db76b618559c3..515d3bf082a4c67ca247d6f3b0be444cf91234d2 100644 (file)
--- a/coregrind/amd64/core_arch.h
+++ b/coregrind/amd64/core_arch.h
@@ -33,6 +33,7 @@
 
 #include "core_arch_asm.h"    // arch-specific asm  stuff
 
+#include "libvex.h"
 #include "libvex_guest_amd64.h"
 
 /* ---------------------------------------------------------------------

diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index b8b4237bf2aa4e14f935c1618ce5388e63fecc34..3216187dc6bc5a96bb0e21e84749064e6b8e4dc4 100644 (file)
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -33,6 +33,7 @@
 
 #include "core_arch_asm.h"    // arch-specific asm  stuff
 
+#include "libvex.h"
 #include "libvex_guest_arm.h"
 
 

diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index 9d4b3556e6c85ea697545132fa853f923f18cff6..68f4faf1bb3226cb08003bbeb24a9d80d8cc49f9 100644 (file)
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -33,6 +33,7 @@
 
 #include "core_arch_asm.h"    // arch-specific asm  stuff
 
+#include "libvex.h"
 #include "libvex_guest_x86.h"
 
 /* ---------------------------------------------------------------------

diff --git a/include/pub_tool_tooliface.h b/include/pub_tool_tooliface.h
index f5840b570473917db05c414569f78a1c32a00f91..2c459062686abebe9096a28eaca3092f405642a7 100644 (file)
--- a/include/pub_tool_tooliface.h
+++ b/include/pub_tool_tooliface.h
@@ -31,6 +31,9 @@
 #ifndef __PUB_TOOL_TOOLIFACE_H
 #define __PUB_TOOL_TOOLIFACE_H
 
+#include "pub_tool_errormgr.h"   // for Error, Supp
+#include "libvex.h"              // for VexGuestLayout
+
 /* ------------------------------------------------------------------ */
 /* The interface version */
 

diff --git a/include/tool.h b/include/tool.h
index 338bbc5fdaecbdbabcfa37e74c5a9bb1d87f08b1..a930165c17056eedcdecd88c860f64a60e1c7e96 100644 (file)
--- a/include/tool.h
+++ b/include/tool.h
@@ -35,12 +35,6 @@
 #include "basic_types.h"
 #include "tool_asm.h"           /* asm stuff */
 
-#include "pub_tool_errormgr.h"      // needed for 'Error', 'Supp'
-#include "pub_tool_execontext.h"    // needed for 'ExeContext'
-
-#include "libvex.h"
-#include "libvex_ir.h"
-
 #if defined(VGO_linux)
 #  include "vki-linux.h"
 #else