X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fxml-support.h;h=59b4467d082a9290151be86ad8417b3acc1c5049;hb=deeafabb678e59d8585be6d765c7fbd0e7060b6c;hp=970ab81291c449e26f2fa54e23a6471ac96d583f;hpb=42a4f53d2bf8938c2aeda9f52be7a20534b214a9;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/xml-support.h b/gdb/xml-support.h
index 970ab81291..59b4467d08 100644
--- a/gdb/xml-support.h
+++ b/gdb/xml-support.h
@@ -22,9 +22,9 @@
 #define XML_SUPPORT_H
 
 #include "gdb_obstack.h"
-#include "vec.h"
-#include "xml-utils.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/xml-utils.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/gdb_optional.h"
 
 struct gdb_xml_parser;
 struct gdb_xml_element;
@@ -44,11 +44,6 @@ LONGEST xml_builtin_xfer_partial (const char *filename,
 				  gdb_byte *readbuf, const gdb_byte *writebuf,
 				  ULONGEST offset, LONGEST len);
 
-/* The text of compiled-in XML documents, from xml-builtin.c
-   (generated).  */
-
-extern const char *xml_builtin[][2];
-
 /* Support for XInclude.  */
 
 /* Callback to fetch a new XML file, based on the provided HREF.  */