From 113178593ea094c8d2f728dd1989e285c43f26d4 Mon Sep 17 00:00:00 2001
From: Stephen Webb <swebb2066@gmail.com>
Date: Sun, 14 Jul 2024 17:05:29 +1000
Subject: [PATCH] Remove class DefaultLoggerFactory in the next ABI

---
 src/main/cpp/hierarchy.cpp           | 16 +++++-----------
 src/main/include/log4cxx/hierarchy.h |  4 ----
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/main/cpp/hierarchy.cpp b/src/main/cpp/hierarchy.cpp
index b11ace087..84b8046de 100644
--- a/src/main/cpp/hierarchy.cpp
+++ b/src/main/cpp/hierarchy.cpp
@@ -15,24 +15,18 @@
  * limitations under the License.
  */
 
-#include <log4cxx/logstring.h>
-#include <log4cxx/spi/loggerfactory.h>
 #include <log4cxx/hierarchy.h>
+#if LOG4CXX_ABI_VERSION <= 15
 #include <log4cxx/defaultloggerfactory.h>
-#include <log4cxx/logger.h>
-#include <log4cxx/spi/hierarchyeventlistener.h>
-#include <log4cxx/level.h>
-#include <algorithm>
+#endif
 #include <log4cxx/helpers/loglog.h>
 #include <log4cxx/appender.h>
-#include <log4cxx/logstring.h>
 #include <log4cxx/helpers/stringhelper.h>
-#if !defined(LOG4CXX)
-	#define LOG4CXX 1
-#endif
 #include <log4cxx/spi/rootlogger.h>
+#include <algorithm>
+#include <map>
 #include <mutex>
-#include "assert.h"
+#include <vector>
 
 
 using namespace LOG4CXX_NS;
diff --git a/src/main/include/log4cxx/hierarchy.h b/src/main/include/log4cxx/hierarchy.h
index 8a913b2a6..55c27fcf6 100644
--- a/src/main/include/log4cxx/hierarchy.h
+++ b/src/main/include/log4cxx/hierarchy.h
@@ -21,12 +21,8 @@
 
 #include <log4cxx/spi/loggerrepository.h>
 #include <log4cxx/spi/loggerfactory.h>
-#include <vector>
-#include <map>
 #include <log4cxx/provisionnode.h>
-#include <log4cxx/helpers/object.h>
 #include <log4cxx/spi/hierarchyeventlistener.h>
-#include <log4cxx/helpers/pool.h>
 
 namespace LOG4CXX_NS
 {