Merge r13421:HEAD from branches/DISRV. This merges the debuginfo-server
stuff into the trunk.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13440 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_debuginfo/d3basics.c b/coregrind/m_debuginfo/d3basics.c
index 13297fb..9253704 100644
--- a/coregrind/m_debuginfo/d3basics.c
+++ b/coregrind/m_debuginfo/d3basics.c
@@ -38,6 +38,7 @@
#include "pub_core_debuginfo.h"
#include "pub_core_libcassert.h"
#include "pub_core_libcprint.h"
+#include "pub_core_libcbase.h"
#include "pub_core_options.h"
#include "pub_core_xarray.h"
@@ -45,6 +46,7 @@
#include "pub_core_aspacemgr.h" /* VG_(is_valid_for_client) */
#include "priv_misc.h"
+#include "priv_image.h"
#include "priv_d3basics.h" /* self */
#include "priv_storage.h"