diff --git a/src/config-store/model/xml-config.cc b/src/config-store/model/xml-config.cc
index add579349..72a0510e3 100644
--- a/src/config-store/model/xml-config.cc
+++ b/src/config-store/model/xml-config.cc
@@ -29,6 +29,7 @@
 #include "ns3/string.h"
 
 #include <libxml/encoding.h>
+#include <libxml/xmlreader.h>
 #include <libxml/xmlwriter.h>
 
 namespace ns3
diff --git a/src/config-store/model/xml-config.h b/src/config-store/model/xml-config.h
index 8b9703042..7d499cc02 100644
--- a/src/config-store/model/xml-config.h
+++ b/src/config-store/model/xml-config.h
@@ -22,10 +22,13 @@
 
 #include "file-config.h"
 
-#include <libxml/xmlreader.h>
-#include <libxml/xmlwriter.h>
 #include <string>
 
+// These are in #include <libxml/xmlwriter.h>,
+// here we just need a forward declaration.
+typedef struct _xmlTextWriter xmlTextWriter;
+typedef xmlTextWriter* xmlTextWriterPtr;
+
 namespace ns3
 {