From 5f4572b8652379e81b65d2c2d5589a234625cae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Thu, 4 Dec 2025 11:17:39 +0100
Subject: [PATCH 1/2] Refactor some R_ext includes

---
 ChangeLog                     | 6 ++++++
 inst/include/Rcpp/r/headers.h | 1 +
 inst/include/RcppCommon.h     | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 64fb4ba23..f7cc796d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-12-04  Iñaki Ucar <iucar@fedoraproject.org>
+
+	* inst/include/Rcpp/r/headers.h: Include <R_ext/Visibility.h>
+	* inst/include/RcppCommon.h: Drop <R_ext/Callbacks.h>, not used anymore
+	and dropped from the API; drop <R_ext/Visibility.h>, included above
+
 2025-12-03  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version, Date): Roll micro version and date
diff --git a/inst/include/Rcpp/r/headers.h b/inst/include/Rcpp/r/headers.h
index c93636c40..02d93ae72 100644
--- a/inst/include/Rcpp/r/headers.h
+++ b/inst/include/Rcpp/r/headers.h
@@ -72,6 +72,7 @@
 #include <R_ext/Complex.h>
 #include <R_ext/Parse.h>
 #include <R_ext/Rdynload.h>
+#include <R_ext/Visibility.h>
 #include <Rversion.h>
 
 /* Ensure NORET defined (normally provided by R headers with R >= 3.2.0) */
diff --git a/inst/include/RcppCommon.h b/inst/include/RcppCommon.h
index 03d5739f2..b4752845e 100644
--- a/inst/include/RcppCommon.h
+++ b/inst/include/RcppCommon.h
@@ -73,8 +73,6 @@ namespace Rcpp {
 #include <typeinfo>
 #include <utility>
 #include <Rcpp/sprintf.h>
-#include <R_ext/Callbacks.h>
-#include <R_ext/Visibility.h>
 #include <Rcpp/utils/tinyformat.h>
 
 #include <Rmath.h>

From c86b440102c54d167569a184084b598f915066f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Thu, 4 Dec 2025 14:46:15 +0100
Subject: [PATCH 2/2] drop PrtUtil.h too

---
 ChangeLog                     | 1 +
 inst/include/Rcpp/r/headers.h | 1 +
 src/api.cpp                   | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f7cc796d9..40f3b007d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* inst/include/Rcpp/r/headers.h: Include <R_ext/Visibility.h>
 	* inst/include/RcppCommon.h: Drop <R_ext/Callbacks.h>, not used anymore
 	and dropped from the API; drop <R_ext/Visibility.h>, included above
+	* src/api.cpp: Drop <R_ext/PrtUtil.h>, dropped from the API
 
 2025-12-03  Dirk Eddelbuettel  <edd@debian.org>
 
diff --git a/inst/include/Rcpp/r/headers.h b/inst/include/Rcpp/r/headers.h
index 02d93ae72..8fedeb57e 100644
--- a/inst/include/Rcpp/r/headers.h
+++ b/inst/include/Rcpp/r/headers.h
@@ -2,6 +2,7 @@
 //
 // Copyright (C) 2008 - 2009 Dirk Eddelbuettel
 // Copyright (C) 2009 - 2024 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2025        Dirk Eddelbuettel, Romain Francois and Iñaki Ucar
 //
 // This file is part of Rcpp.
 //
diff --git a/src/api.cpp b/src/api.cpp
index 36246b0a7..723a90ccc 100644
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -28,7 +28,6 @@
 using namespace Rcpp;
 
 #include "internal.h"
-#include <R_ext/PrtUtil.h>
 
 #ifdef RCPP_HAS_DEMANGLING
 #include <cxxabi.h>