Fix #includes in some more libiberty files that seem to have been
forgotten about in r8710. This should _really_ make the revised
demangler independent of any system installed libiberty.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8714 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_demangle/dyn-string.c b/coregrind/m_demangle/dyn-string.c
index 0836971..70449dd 100644
--- a/coregrind/m_demangle/dyn-string.c
+++ b/coregrind/m_demangle/dyn-string.c
@@ -28,25 +28,34 @@
the Free Software Foundation, 51 Franklin Street - Fifth Floor,
Boston, MA 02110-1301, USA. */
-/////////////////////////////
-#include <string.h>
-#include <stdlib.h>
-/////////////////////////////
+#if 0 /* in valgrind */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#endif /* ! in valgrind */
+#if 0 /* in valgrind */
#include <stdio.h>
+#endif /* ! in valgrind */
+#if 0 /* in valgrind */
#ifdef HAVE_STRING_H
#include <string.h>
#endif
+#endif /* ! in valgrind */
+#if 0 /* in valgrind */
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
+#endif /* ! in valgrind */
+#if 0 /* in valgrind */
#include "libiberty.h"
+#endif /* ! in valgrind */
+
+#include "vg_libciface.h"
+
#include "dyn-string.h"
/* Performs in-place initialization of a dyn_string struct. This