From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 16 May 2005 20:40:51 +0000 (+0000)
Subject: core.h: remove some #include lines, move some others to more localised
X-Git-Tag: svn/VALGRIND_3_0_0~573
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=586e79e4bd133e958033d1babd8b758634a28703;p=thirdparty%2Fvalgrind.git

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 cae7b23410..515d3bf082 100644
--- 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 b8b4237bf2..3216187dc6 100644
--- 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 9d4b3556e6..68f4faf1bb 100644
--- 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 f5840b5704..2c45906268 100644
--- 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 338bbc5fda..a930165c17 100644
--- 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