Also run all_verify_interface_header_sets over the internal headers

While at it don't install headers that have no exported classes
and are not included by other installed headers

16 files changed, 222 insertions, 209 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef4beba3..4a1baf37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ build:
     - bash do-the-gnupg-2.4-dance.sh $PWD/build/gnupg/
     - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
     - mkdir -p build && cd build
-    - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data -DCMAKE_PREFIX_PATH=$PWD/gnupg ..
+    - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data -DCMAKE_PREFIX_PATH=$PWD/gnupg -DENABLE_UNSTABLE_API_ABI_HEADERS=ON ..
     - ninja -j ${FDO_CI_CONCURRENT}
     - ninja -j ${FDO_CI_CONCURRENT} all_verify_interface_header_sets
     - ctest --output-on-failure
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2951fe6..b0c51882 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,22 +669,17 @@ target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
 install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 if(ENABLE_UNSTABLE_API_ABI_HEADERS)
-  install(FILES
+  set(poppler_poppler_installed_headers
     poppler/Annot.h
     poppler/AnnotStampImageHelper.h
     poppler/Array.h
     poppler/CachedFile.h
     poppler/Catalog.h
-    poppler/CharCodeToUnicode.h
-    poppler/CMap.h
     poppler/DateInfo.h
-    poppler/Decrypt.h
     poppler/Dict.h
     poppler/Error.h
-    poppler/FDPDFDocBuilder.h
     poppler/FILECacheLoader.h
     poppler/FileSpec.h
-    poppler/FontEncodingTables.h
     poppler/FontInfo.h
     poppler/Form.h
     poppler/Function.h
@@ -693,18 +688,12 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
     poppler/GfxState.h
     poppler/GfxState_helpers.h
     poppler/GlobalParams.h
-    poppler/Hints.h
     poppler/HashAlgorithm.h
-    poppler/JArithmeticDecoder.h
-    poppler/JBIG2Stream.h
     poppler/JSInfo.h
     poppler/Lexer.h
     poppler/Link.h
-    poppler/Linearization.h
-    poppler/LocalPDFDocBuilder.h
     poppler/MarkedContentOutputDev.h
     poppler/Movie.h
-    poppler/NameToCharCode.h
     poppler/Object.h
     poppler/OptionalContent.h
     poppler/Outline.h
@@ -718,15 +707,12 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
     poppler/PDFDocFactory.h
     poppler/PopplerCache.h
     poppler/ProfileData.h
-    poppler/PreScanOutputDev.h
-    poppler/PSTokenizer.h
     poppler/Rendition.h
     poppler/CertificateInfo.h
     poppler/SignatureInfo.h
     poppler/Stream-CCITT.h
     poppler/Stream.h
     poppler/StructElement.h
-    poppler/StructTreeRoot.h
     poppler/UnicodeMap.h
     poppler/UnicodeMapFuncs.h
     poppler/UnicodeMapTables.h
@@ -734,80 +720,42 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
     poppler/UnicodeCClassTables.h
     poppler/UnicodeCompTables.h
     poppler/UnicodeDecompTables.h
-    poppler/ViewerPreferences.h
     poppler/XRef.h
     poppler/CharTypes.h
     poppler/ErrorCodes.h
     poppler/NameToUnicodeTable.h
     poppler/PSOutputDev.h
     poppler/TextOutputDev.h
-    poppler/SecurityHandler.h
     poppler/BBoxOutputDev.h
     poppler/UTF.h
     poppler/Sound.h
     ${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h
     poppler/SplashOutputDev.h
-    DESTINATION include/poppler)
-  install(FILES
+    )
+  set(poppler_goo_installed_headers
     goo/GooTimer.h
     goo/GooString.h
     goo/gmem.h
-    goo/gdir.h
     goo/gfile.h
     goo/ImgWriter.h
     goo/GooCheckedOps.h
     goo/GooLikely.h
     goo/gstrtod.h
     goo/grandom.h
-    DESTINATION include/poppler/goo)
-  if(PNG_FOUND)
-    install(FILES
-      goo/PNGWriter.h
-      DESTINATION include/poppler/goo)
-  endif()
-  if(ENABLE_LIBTIFF)
-    install(FILES
-      goo/TiffWriter.h
-      DESTINATION include/poppler/goo)
-  endif()
-  if(JPEG_FOUND)
-    install(FILES
-      goo/JpegWriter.h
-      DESTINATION include/poppler/goo)
-  endif()
-  install(FILES
+    )
+  set(poppler_fofi_installed_headers
     fofi/FoFiBase.h
     fofi/FoFiEncodings.h
     fofi/FoFiTrueType.h
-    fofi/FoFiType1.h
     fofi/FoFiType1C.h
     fofi/FoFiIdentifier.h
-    DESTINATION include/poppler/fofi)
-  if(ENABLE_LIBCURL)
-    install(FILES
-      poppler/CurlCachedFile.h
-      poppler/CurlPDFDocBuilder.h
-      DESTINATION include/poppler)
-  endif()
-  if(OpenJPEG_FOUND)
-    install(FILES
-      poppler/JPEG2000Stream.h
-      DESTINATION include/poppler)
-  else()
-    install(FILES
-      poppler/JPXStream.h
-      DESTINATION include/poppler)
-  endif()
-  install(FILES
+  )
+  set(poppler_splash_installed_headers
     splash/Splash.h
     splash/SplashBitmap.h
     splash/SplashClip.h
     splash/SplashErrorCodes.h
-    splash/SplashFTFont.h
-    splash/SplashFTFontEngine.h
-    splash/SplashFTFontFile.h
-    splash/SplashFont.h
     splash/SplashFontEngine.h
     splash/SplashFontFile.h
     splash/SplashFontFileID.h
@@ -815,21 +763,56 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
     splash/SplashMath.h
     splash/SplashPath.h
     splash/SplashPattern.h
-    splash/SplashScreen.h
-    splash/SplashState.h
     splash/SplashTypes.h
-    splash/SplashXPath.h
-    splash/SplashXPathScanner.h
-    DESTINATION include/poppler/splash)
-  if(CAIRO_FOUND)
-    install(FILES
-      poppler/CairoFontEngine.h
-      poppler/CairoOutputDev.h
-      poppler/CairoRescaleBox.h
-      DESTINATION include/poppler)
+  )
+  if(ENABLE_LIBCURL)
+    set(poppler_poppler_installed_headers
+          ${poppler_poppler_installed_headers}
+          poppler/CurlCachedFile.h
+          poppler/CurlPDFDocBuilder.h)
+  endif()
+  if(OpenJPEG_FOUND)
+    set(poppler_poppler_installed_headers ${poppler_poppler_installed_headers} poppler/JPEG2000Stream.h)
+  else()
+    set(poppler_poppler_installed_headers ${poppler_poppler_installed_headers} poppler/JPXStream.h)
+  endif()
+  if(PNG_FOUND)
+    set(poppler_goo_installed_headers ${poppler_goo_installed_headers} goo/PNGWriter.h)
+  endif()
+  if(ENABLE_LIBTIFF)
+    set(poppler_goo_installed_headers ${poppler_goo_installed_headers} goo/TiffWriter.h)
+  endif()
+  if(JPEG_FOUND)
+    set(poppler_goo_installed_headers ${poppler_goo_installed_headers} goo/JpegWriter.h)
   endif()
-endif()
 
+  if (${CMAKE_VERSION} VERSION_LESS "3.23.0")
+    install(FILES ${poppler_poppler_installed_headers} DESTINATION include/poppler)
+    install(FILES ${poppler_goo_installed_headers} DESTINATION include/poppler/goo)
+    install(FILES ${poppler_fofi_installed_headers} DESTINATION include/poppler/fofi)
+    install(FILES ${poppler_splash_installed_headers} DESTINATION include/poppler/splash)
+  else()
+    target_sources(poppler
+      PUBLIC FILE_SET poppler_poppler
+      TYPE HEADERS
+      BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/poppler;${CMAKE_CURRENT_BINARY_DIR}
+      FILES ${poppler_poppler_installed_headers}
+    )
+    target_sources(poppler
+      PUBLIC FILE_SET poppler_goo_fofi_splash
+      TYPE HEADERS
+      BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
+      FILES
+        ${poppler_goo_installed_headers}
+        ${poppler_fofi_installed_headers}
+        ${poppler_splash_installed_headers}
+    )
+    install(TARGETS poppler
+        FILE_SET poppler_poppler DESTINATION include/poppler
+        FILE_SET poppler_goo_fofi_splash DESTINATION include/poppler
+    )
+  endif()
+endif()
 
 if(ENABLE_UTILS)
   add_subdirectory(utils)
diff --git a/fofi/FoFiBase.h b/fofi/FoFiBase.h
index ca62e948..2df53fef 100644
--- a/fofi/FoFiBase.h
+++ b/fofi/FoFiBase.h
@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2018, 2022 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2018, 2022, 2024 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2022 Oliver Sander <oliver.sander@tu-dresden.de>
 //
 // To see a description of the changes please see the Changelog file that
@@ -24,6 +24,10 @@
 #ifndef FOFIBASE_H
 #define FOFIBASE_H
 
+#include "poppler_private_export.h"
+
+#include <cstddef>
+
 //------------------------------------------------------------------------
 
 using FoFiOutputFunc = void (*)(void *stream, const char *data, size_t len);
diff --git a/poppler/Array.h b/poppler/Array.h
index 50bc9d0a..9846bb95 100644
--- a/poppler/Array.h
+++ b/poppler/Array.h
@@ -16,7 +16,7 @@
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2017-2019, 2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2017-2019, 2021, 2024 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2018, 2019 Adam Reichold <adam.reichold@t-online.de>
 //
@@ -89,4 +89,38 @@ private:
     mutable std::recursive_mutex mutex;
 };
 
+//------------------------------------------------------------------------
+// Object Array accessors.
+//------------------------------------------------------------------------
+
+inline int Object::arrayGetLength() const
+{
+    OBJECT_TYPE_CHECK(objArray);
+    return array->getLength();
+}
+
+inline void Object::arrayAdd(Object &&elem)
+{
+    OBJECT_TYPE_CHECK(objArray);
+    array->add(std::move(elem));
+}
+
+inline void Object::arrayRemove(int i)
+{
+    OBJECT_TYPE_CHECK(objArray);
+    array->remove(i);
+}
+
+inline Object Object::arrayGet(int i, int recursion = 0) const
+{
+    OBJECT_TYPE_CHECK(objArray);
+    return array->get(i, recursion);
+}
+
+inline const Object &Object::arrayGetNF(int i) const
+{
+    OBJECT_TYPE_CHECK(objArray);
+    return array->getNF(i);
+}
+
 #endif
diff --git a/poppler/CharCodeToUnicode.h b/poppler/CharCodeToUnicode.h
index dc2fa84c..3beedd9f 100644
--- a/poppler/CharCodeToUnicode.h
+++ b/poppler/CharCodeToUnicode.h
@@ -17,7 +17,7 @@
 //
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008, 2011, 2012, 2018, 2019, 2021, 2022 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2011, 2012, 2018, 2019, 2021, 2022, 2024 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
@@ -34,6 +34,7 @@
 
 #include <atomic>
 #include <optional>
+#include <string>
 #include <vector>
 
 #include "poppler-config.h"
diff --git a/poppler/Dict.h b/poppler/Dict.h
index 621b76a2..1b8fe649 100644
--- a/poppler/Dict.h
+++ b/poppler/Dict.h
@@ -16,7 +16,7 @@
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2010, 2017-2022 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010, 2017-2022, 2024 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
@@ -128,4 +128,73 @@ private:
     DictEntry *find(const char *key);
 };
 
+//------------------------------------------------------------------------
+// Object Dict accessors.
+//------------------------------------------------------------------------
+
+inline int Object::dictGetLength() const
+{
+    OBJECT_TYPE_CHECK(objDict);
+    return dict->getLength();
+}
+
+inline void Object::dictAdd(const char *key, Object &&val)
+{
+    OBJECT_TYPE_CHECK(objDict);
+    dict->add(key, std::move(val));
+}
+
+inline void Object::dictSet(const char *key, Object &&val)
+{
+    OBJECT_TYPE_CHECK(objDict);
+    dict->set(key, std::move(val));
+}
+
+inline void Object::dictRemove(const char *key)
+{
+    OBJECT_TYPE_CHECK(objDict);
+    dict->remove(key);
+}
+
+inline bool Object::dictIs(const char *dictType) const
+{
+    OBJECT_TYPE_CHECK(objDict);
+    return dict->is(dictType);
+}
+
+inline bool Object::isDict(const char *dictType) const
+{
+    return type == objDict && dictIs(dictType);
+}
+
+inline Object Object::dictLookup(const char *key, int recursion) const
+{
+    OBJECT_TYPE_CHECK(objDict);
+    return dict->lookup(key, recursion);
+}
+
+inline const Object &Object::dictLookupNF(const char *key) const
+{
+    OBJECT_TYPE_CHECK(objDict);
+    return dict->lookupNF(key);
+}
+
+inline const char *Object::dictGetKey(int i) const
+{
+    OBJECT_TYPE_CHECK(objDict);
+    return dict->getKey(i);
+}
+
+inline Object Object::dictGetVal(int i) const
+{
+    OBJECT_TYPE_CHECK(objDict);
+    return dict->getVal(i);
+}
+
+inline const Object &Object::dictGetValNF(int i) const
+{
+    OBJECT_TYPE_CHECK(objDict);
+    return dict->getValNF(i);
+}
+
 #endif
diff --git a/poppler/Object.h b/poppler/Object.h
index e70a9749..b3896ec1 100644
--- a/poppler/Object.h
+++ b/poppler/Object.h
@@ -582,141 +582,16 @@ private:
 
 #include "Array.h"
 
-inline int Object::arrayGetLength() const
-{
-    OBJECT_TYPE_CHECK(objArray);
-    return array->getLength();
-}
-
-inline void Object::arrayAdd(Object &&elem)
-{
-    OBJECT_TYPE_CHECK(objArray);
-    array->add(std::move(elem));
-}
-
-inline void Object::arrayRemove(int i)
-{
-    OBJECT_TYPE_CHECK(objArray);
-    array->remove(i);
-}
-
-inline Object Object::arrayGet(int i, int recursion = 0) const
-{
-    OBJECT_TYPE_CHECK(objArray);
-    return array->get(i, recursion);
-}
-
-inline const Object &Object::arrayGetNF(int i) const
-{
-    OBJECT_TYPE_CHECK(objArray);
-    return array->getNF(i);
-}
-
 //------------------------------------------------------------------------
 // Dict accessors.
 //------------------------------------------------------------------------
 
 #include "Dict.h"
 
-inline int Object::dictGetLength() const
-{
-    OBJECT_TYPE_CHECK(objDict);
-    return dict->getLength();
-}
-
-inline void Object::dictAdd(const char *key, Object &&val)
-{
-    OBJECT_TYPE_CHECK(objDict);
-    dict->add(key, std::move(val));
-}
-
-inline void Object::dictSet(const char *key, Object &&val)
-{
-    OBJECT_TYPE_CHECK(objDict);
-    dict->set(key, std::move(val));
-}
-
-inline void Object::dictRemove(const char *key)
-{
-    OBJECT_TYPE_CHECK(objDict);
-    dict->remove(key);
-}
-
-inline bool Object::dictIs(const char *dictType) const
-{
-    OBJECT_TYPE_CHECK(objDict);
-    return dict->is(dictType);
-}
-
-inline bool Object::isDict(const char *dictType) const
-{
-    return type == objDict && dictIs(dictType);
-}
-
-inline Object Object::dictLookup(const char *key, int recursion) const
-{
-    OBJECT_TYPE_CHECK(objDict);
-    return dict->lookup(key, recursion);
-}
-
-inline const Object &Object::dictLookupNF(const char *key) const
-{
-    OBJECT_TYPE_CHECK(objDict);
-    return dict->lookupNF(key);
-}
-
-inline const char *Object::dictGetKey(int i) const
-{
-    OBJECT_TYPE_CHECK(objDict);
-    return dict->getKey(i);
-}
-
-inline Object Object::dictGetVal(int i) const
-{
-    OBJECT_TYPE_CHECK(objDict);
-    return dict->getVal(i);
-}
-
-inline const Object &Object::dictGetValNF(int i) const
-{
-    OBJECT_TYPE_CHECK(objDict);
-    return dict->getValNF(i);
-}
-
 //------------------------------------------------------------------------
 // Stream accessors.
 //------------------------------------------------------------------------
 
 #include "Stream.h"
 
-inline void Object::streamReset()
-{
-    OBJECT_TYPE_CHECK(objStream);
-    stream->reset();
-}
-
-inline void Object::streamClose()
-{
-    OBJECT_TYPE_CHECK(objStream);
-    stream->close();
-}
-
-inline int Object::streamGetChar()
-{
-    OBJECT_TYPE_CHECK(objStream);
-    return stream->getChar();
-}
-
-inline int Object::streamGetChars(int nChars, unsigned char *buffer)
-{
-    OBJECT_TYPE_CHECK(objStream);
-    return stream->doGetChars(nChars, buffer);
-}
-
-inline Dict *Object::streamGetDict() const
-{
-    OBJECT_TYPE_CHECK(objStream);
-    return stream->getDict();
-}
-
 #endif
diff --git a/poppler/Sound.h b/poppler/Sound.h
index aa080bfd..df52f29d 100644
--- a/poppler/Sound.h
+++ b/poppler/Sound.h
@@ -1,6 +1,6 @@
 /* Sound.h - an object that holds the sound structure
  * Copyright (C) 2006-2007, Pino Toscano <pino@kde.org>
- * Copyright (C) 2017-2021, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2017-2021, 2024, Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2020, Oliver Sander <oliver.sander@tu-dresden.de>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,8 +23,9 @@
 
 #include <memory>
 
-class Object;
-class Stream;
+#include "poppler_private_export.h"
+
+#include "Object.h"
 
 //------------------------------------------------------------------------
 
diff --git a/poppler/Stream.h b/poppler/Stream.h
index b1b8b492..b96fd151 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -1514,4 +1514,38 @@ private:
     bool fillBuf();
 };
 
+//------------------------------------------------------------------------
+// Object Stream accessors.
+//------------------------------------------------------------------------
+
+inline void Object::streamReset()
+{
+    OBJECT_TYPE_CHECK(objStream);
+    stream->reset();
+}
+
+inline void Object::streamClose()
+{
+    OBJECT_TYPE_CHECK(objStream);
+    stream->close();
+}
+
+inline int Object::streamGetChar()
+{
+    OBJECT_TYPE_CHECK(objStream);
+    return stream->getChar();
+}
+
+inline int Object::streamGetChars(int nChars, unsigned char *buffer)
+{
+    OBJECT_TYPE_CHECK(objStream);
+    return stream->doGetChars(nChars, buffer);
+}
+
+inline Dict *Object::streamGetDict() const
+{
+    OBJECT_TYPE_CHECK(objStream);
+    return stream->getDict();
+}
+
 #endif
diff --git a/poppler/UnicodeCClassTables.h b/poppler/UnicodeCClassTables.h
index 88d119bc..4a90f276 100644
--- a/poppler/UnicodeCClassTables.h
+++ b/poppler/UnicodeCClassTables.h
@@ -5,6 +5,8 @@
 // Can be regenerated from gen-unicode-tables.pl, also in GLib, with relevant
 // Unicode data tables from ftp.unicode.org.
 
+#include "UnicodeTypeTable.h"
+
 static const Unicode cclass_data[][256] = {
     { /* page 3, index 0 */
       230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 232, 220, 220, 220, 220, 232, 216, 220, 220, 220, 220, 220, 202, 202, 220, 220, 220, 220, 202, 202, 220, 220,
diff --git a/poppler/UnicodeCompTables.h b/poppler/UnicodeCompTables.h
index f74ffcd0..77d8818e 100644
--- a/poppler/UnicodeCompTables.h
+++ b/poppler/UnicodeCompTables.h
@@ -5,6 +5,8 @@
 // Can be regenerated from gen-unicode-tables.pl, also in GLib, with relevant
 // Unicode data tables from ftp.unicode.org.
 
+#include "UnicodeTypeTable.h"
+
 #define COMPOSE_FIRST_START 1
 #define COMPOSE_FIRST_SINGLE_START 147
 #define COMPOSE_SECOND_START 357
diff --git a/poppler/UnicodeDecompTables.h b/poppler/UnicodeDecompTables.h
index 8cb793c0..fb245e3a 100644
--- a/poppler/UnicodeDecompTables.h
+++ b/poppler/UnicodeDecompTables.h
@@ -1,5 +1,7 @@
 // Generated by gen-unicode-tables.py
 
+#include "CharTypes.h"
+
 typedef struct
 {
     Unicode character;
diff --git a/poppler/UnicodeMapTables.h b/poppler/UnicodeMapTables.h
index 7c89feb2..bfb5a37d 100644
--- a/poppler/UnicodeMapTables.h
+++ b/poppler/UnicodeMapTables.h
@@ -14,12 +14,15 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2019 Volker Krause <vkrause@kde.org>
+// Copyright (C) 2024 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
 //
 //========================================================================
 
+#include "UnicodeMap.h"
+
 static const UnicodeMapRange latin1UnicodeMapRanges[] = {
     { 0x000a, 0x000a, 0x0a, 1 },     { 0x000c, 0x000d, 0x0c, 1 },     { 0x0020, 0x007e, 0x20, 1 },     { 0x00a0, 0x00a0, 0x20, 1 },  { 0x00a1, 0x00ac, 0xa1, 1 },   { 0x00ae, 0x00ff, 0xae, 1 },   { 0x010c, 0x010c, 0x43, 1 },
     { 0x010d, 0x010d, 0x63, 1 },     { 0x0131, 0x0131, 0x69, 1 },     { 0x0141, 0x0141, 0x4c, 1 },     { 0x0142, 0x0142, 0x6c, 1 },  { 0x0152, 0x0152, 0x4f45, 2 }, { 0x0153, 0x0153, 0x6f65, 2 }, { 0x0160, 0x0160, 0x53, 1 },
diff --git a/poppler/UnicodeTypeTable.cc b/poppler/UnicodeTypeTable.cc
index 2b19477f..c41aaf9b 100644
--- a/poppler/UnicodeTypeTable.cc
+++ b/poppler/UnicodeTypeTable.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2006, 2007 Ed Catmur <ed@catmur.co.uk>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2008, 2016 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2016, 2024 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2016 Khaled Hosny <khaledhosny@eglug.org>
 // Copyright (C) 2019 Adriaan de Groot <groot@kde.org>
@@ -637,8 +637,6 @@ Unicode unicodeToUpper(Unicode c)
     return c;
 }
 
-#define UNICODE_LAST_CHAR 0x10FFFF
-#define UNICODE_MAX_TABLE_INDEX (UNICODE_LAST_CHAR / 256 + 1)
 // large empty block between U+2FA1D and U+E0001
 #define UNICODE_LAST_CHAR_PART1 0x2FAFF
 #define UNICODE_LAST_PAGE_PART1 (UNICODE_LAST_CHAR_PART1 / 256)
diff --git a/poppler/UnicodeTypeTable.h b/poppler/UnicodeTypeTable.h
index 85d88d62..f3e5f763 100644
--- a/poppler/UnicodeTypeTable.h
+++ b/poppler/UnicodeTypeTable.h
@@ -17,7 +17,7 @@
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2016 Khaled Hosny <khaledhosny@eglug.org>
 // Copyright (C) 2019 Adriaan de Groot <groot@kde.org>
-// Copyright (C) 2019 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2019, 2024 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -30,6 +30,9 @@
 #include "CharTypes.h"
 #include "poppler_private_export.h"
 
+#define UNICODE_LAST_CHAR 0x10FFFF
+#define UNICODE_MAX_TABLE_INDEX (UNICODE_LAST_CHAR / 256 + 1)
+
 extern bool unicodeTypeL(Unicode c);
 
 extern bool unicodeTypeR(Unicode c);
diff --git a/splash/SplashState.h b/splash/SplashState.h
index 009c1f14..1648e32e 100644
--- a/splash/SplashState.h
+++ b/splash/SplashState.h
@@ -13,7 +13,7 @@
 //
 // Copyright (C) 2011, 2012, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2018, 2021, 2022 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2018, 2021, 2022, 2024 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -25,6 +25,8 @@
 
 #include "SplashTypes.h"
 
+#include <vector>
+
 class SplashPattern;
 class SplashScreen;
 class SplashClip;