From f80751224af49fe511aa801dda9ddb22110b2d5e Mon Sep 17 00:00:00 2001
From: Michael Chirico <michaelchirico4@gmail.com>
Date: Mon, 2 Feb 2026 22:17:32 -0800
Subject: [PATCH] include what you use

---
 src/connection.cpp     |  2 ++
 src/connection.h       |  1 -
 src/init.c             |  1 +
 src/xml2_doc.cpp       |  3 +++
 src/xml2_init.c        |  3 +++
 src/xml2_namespace.cpp |  3 +++
 src/xml2_node.cpp      | 11 +++++++----
 src/xml2_output.cpp    |  5 +++++
 src/xml2_schema.cpp    |  3 +++
 src/xml2_url.cpp       |  6 ++++++
 src/xml2_utils.h       |  4 ++++
 src/xml2_xpath.cpp     |  5 +++++
 12 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/connection.cpp b/src/connection.cpp
index 14122a8..de64611 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -1,4 +1,6 @@
 #include <Rinternals.h>
+#include <algorithm> // std::copy
+#include <cstddef> // size_t
 #include <iterator>
 #include <vector>
 #include "xml2_utils.h"
diff --git a/src/connection.h b/src/connection.h
index e79fcee..eab8860 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Rinternals.h>
-#include <algorithm>
 #include <cstring>
 
 SEXP read_bin(SEXP con, size_t bytes = 64 * 1024);
diff --git a/src/init.c b/src/init.c
index 7295cf0..d136ecc 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1,5 +1,6 @@
 #include <Rinternals.h>
 #include <stdlib.h> // for NULL
+#include <R_ext/Boolean.h> // FALSE
 #include <R_ext/Rdynload.h>
 #include <R_ext/Visibility.h>
 
diff --git a/src/xml2_doc.cpp b/src/xml2_doc.cpp
index 7a070b5..902c231 100644
--- a/src/xml2_doc.cpp
+++ b/src/xml2_doc.cpp
@@ -1,11 +1,14 @@
+#include <R_ext/Error.h> // Rf_error
 #include <Rinternals.h>
 #include <libxml/encoding.h> // xmlCharEncoding, xmlGetCharEncodingName, xmlParseCharEncoding
 #include <libxml/parser.h>
 #include <libxml/xmlstring.h> // xmlChar, xmlStrdup
+#include <libxml/xmlversion.h> // LIBXML_VERSION
 #include <libxml/HTMLparser.h>
 #include "xml2_types.h"
 #include "xml2_utils.h"
 #include <cstring>
+#include <string> // std::string
 
 // [[export]]
 extern "C" SEXP  xml_parse_options_() {
diff --git a/src/xml2_init.c b/src/xml2_init.c
index 73f194a..73980af 100644
--- a/src/xml2_init.c
+++ b/src/xml2_init.c
@@ -1,7 +1,10 @@
+#include <R_ext/Error.h> // Rf_error, Rf_warning
 #include <Rinternals.h>
 #include <libxml/xmlversion.h>
 #include <libxml/xmlerror.h>
 #include <libxml/parser.h>
+#include <stdarg.h> // va_start
+#include <stdio.h> // BUFSIZ, vsnprintf
 #include <string.h>
 
 /* * *
diff --git a/src/xml2_namespace.cpp b/src/xml2_namespace.cpp
index 7d0ea29..a41dca4 100644
--- a/src/xml2_namespace.cpp
+++ b/src/xml2_namespace.cpp
@@ -1,5 +1,8 @@
+#include <R_ext/Error.h> // Rf_error
 #include <Rinternals.h>
 #include <libxml/tree.h>
+#include <libxml/xmlversion.h> // LIBXML_DOTTED_VERSION
+#include <cstddef> // NULL
 
 #include "xml2_types.h"
 #include "xml2_utils.h"
diff --git a/src/xml2_node.cpp b/src/xml2_node.cpp
index 6fcf59f..a389967 100644
--- a/src/xml2_node.cpp
+++ b/src/xml2_node.cpp
@@ -1,10 +1,13 @@
+#include <R_ext/Error.h> // Rf_error
+#include <R_ext/Arith.h> // NA_INTEGER
 #include <Rinternals.h>
 #include <libxml/tree.h>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <string>
+#include <libxml/xmlstring.h> // xmlChar, xmlStrEqual
+#include <algorithm> // std::equal
+#include <cstddef> // NULL, size_t
 #include <set>
+#include <string>
+#include <vector>
 
 #include "xml2_types.h"
 #include "xml2_utils.h"
diff --git a/src/xml2_output.cpp b/src/xml2_output.cpp
index 660288c..94a0c36 100644
--- a/src/xml2_output.cpp
+++ b/src/xml2_output.cpp
@@ -1,7 +1,12 @@
+#include <R_ext/Error.h> // Rf_error
 #include <Rinternals.h>
 #include <libxml/tree.h>
 #include <libxml/HTMLtree.h>
+#include <libxml/xmlIO.h> // xmlOutputWriteCallback
+#include <libxml/xmlmemory.h> // xmlFree
 #include <libxml/xmlsave.h>
+#include <libxml/xmlversion.h> // LIBXML_VERSION
+#include <cstddef> // NULL, size_t
 
 #include "connection.h"
 #include "xml2_types.h"
diff --git a/src/xml2_schema.cpp b/src/xml2_schema.cpp
index 3b5ea63..366f87e 100644
--- a/src/xml2_schema.cpp
+++ b/src/xml2_schema.cpp
@@ -1,5 +1,8 @@
 #include <Rinternals.h>
+#include <libxml/xmlerror.h> // xmlError
 #include <libxml/xmlschemas.h>
+#include <libxml/xmlversion.h> // LIBXML_VERSION
+#include <cstddef> // size_t
 #include <vector>
 #include <string>
 
diff --git a/src/xml2_url.cpp b/src/xml2_url.cpp
index 7a5c0da..32fd8ca 100644
--- a/src/xml2_url.cpp
+++ b/src/xml2_url.cpp
@@ -1,5 +1,11 @@
+#include <R_ext/Arith.h> // NA_INTEGER
+#include <R_ext/Error.h> // Rf_error
 #include <Rinternals.h>
 #include <libxml/uri.h>
+#include <libxml/xmlmemory.h> // xmlFree
+#include <libxml/xmlstring.h> // xmlChar
+#include <libxml/xmlversion.h> // LIBXML_VERSION
+#include <cstddef> // NULL
 #include "xml2_utils.h"
 
 // [[export]]
diff --git a/src/xml2_utils.h b/src/xml2_utils.h
index d43c5dd..a75e7a1 100644
--- a/src/xml2_utils.h
+++ b/src/xml2_utils.h
@@ -1,8 +1,12 @@
 #ifndef __XML2_XML_UTILS__
 #define __XML2_XML_UTILS__
 
+#include <R_ext/Error.h> // Rf_error
 #include <Rinternals.h>
 #include <libxml/tree.h>
+#include <libxml/xmlmemory.h> // xmlFree
+#include <libxml/xmlstring.h> // xmlChar
+#include <cstddef> // NULL, size_t
 #include <map>
 #include <string>
 
diff --git a/src/xml2_xpath.cpp b/src/xml2_xpath.cpp
index 004f343..dfed24a 100644
--- a/src/xml2_xpath.cpp
+++ b/src/xml2_xpath.cpp
@@ -1,9 +1,14 @@
+#include <R_ext/Arith.h> // R_PosInf
+#include <R_ext/Error.h> // Rf_error
 #include <Rinternals.h>
+#include <libxml/xmlstring.h> // xmlChar
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/tree.h>
 #include "xml2_types.h"
 #include <algorithm>
+#include <climits> // INT_MAX
+#include <cstddef> // NULL
 
 class XmlSeeker {
   xmlXPathContext* context_;