From: Andrei Pavel <andrei@isc.org>
Date: Mon, 4 Mar 2024 13:16:36 +0000 (+0200)
Subject: [#3210] clean up some header includes
X-Git-Tag: Kea-2.5.7~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40f563418db677f031ec7a32ff05a05e9218d315;p=thirdparty%2Fkea.git

[#3210] clean up some header includes
---

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 0b5c90c6a5..0cfa5de2b7 100644
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -42,7 +42,6 @@
 #include <process/config_ctl_parser.h>
 #include <util/encode/encode.h>
 #include <util/multi_threading_mgr.h>
-#include <util/str.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 548eaa8b9a..1f21a2f7e0 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -48,7 +48,6 @@
 #include <hooks/hooks_manager.h>
 #include <stats/stats_mgr.h>
 #include <util/encode/encode.h>
-#include <util/io.h>
 #include <util/pointer_util.h>
 #include <util/range_utilities.h>
 #include <log/logger.h>
diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 62d8df4239..207dde7b0b 100644
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -45,7 +45,6 @@
 #include <process/config_ctl_parser.h>
 #include <util/encode/encode.h>
 #include <util/multi_threading_mgr.h>
-#include <util/str.h>
 #include <util/triplet.h>
 
 #include <boost/algorithm/string.hpp>
diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index 7c6ebf0579..54e6364131 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -29,7 +29,6 @@
 #include <stats/stats_mgr.h>
 #include <util/encode/encode.h>
 #include <util/multi_threading_mgr.h>
-#include <util/str.h>
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc
index 8256fa2de6..1d6170d730 100644
--- a/src/lib/asiodns/io_fetch.cc
+++ b/src/lib/asiodns/io_fetch.cc
@@ -21,6 +21,7 @@
 #include <cryptolink/crypto_rng.h>
 #include <dns/rcode.h>
 #include <util/buffer.h>
+#include <util/io.h>
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
diff --git a/src/lib/asiolink/tls_socket.h b/src/lib/asiolink/tls_socket.h
index 13e32037f9..8c86c00525 100644
--- a/src/lib/asiolink/tls_socket.h
+++ b/src/lib/asiolink/tls_socket.h
@@ -13,6 +13,7 @@
 
 #include <asiolink/crypto_tls.h>
 #include <asiolink/tcp_socket.h>
+#include <util/io.h>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/src/lib/dhcp/duid.cc b/src/lib/dhcp/duid.cc
index 1b1728958d..de19e77a91 100644
--- a/src/lib/dhcp/duid.cc
+++ b/src/lib/dhcp/duid.cc
@@ -8,7 +8,6 @@
 
 #include <dhcp/duid.h>
 #include <exceptions/exceptions.h>
-#include <util/io.h>
 #include <iomanip>
 #include <cctype>
 #include <sstream>
diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index ef39c58c5d..a98bea92b7 100644
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -21,6 +21,7 @@
 #include <exceptions/exceptions.h>
 #include <exceptions/isc_assert.h>
 #include <util/buffer.h>
+#include <util/io.h>
 
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/src/lib/dhcp/opaque_data_tuple.cc b/src/lib/dhcp/opaque_data_tuple.cc
index e09f7a7872..2673a97b68 100644
--- a/src/lib/dhcp/opaque_data_tuple.cc
+++ b/src/lib/dhcp/opaque_data_tuple.cc
@@ -7,6 +7,7 @@
 #include <config.h>
 
 #include <dhcp/opaque_data_tuple.h>
+#include <util/io.h>
 
 namespace isc {
 namespace dhcp {
diff --git a/src/lib/dhcp/opaque_data_tuple.h b/src/lib/dhcp/opaque_data_tuple.h
index f6dabedb53..03887e3675 100644
--- a/src/lib/dhcp/opaque_data_tuple.h
+++ b/src/lib/dhcp/opaque_data_tuple.h
@@ -9,7 +9,6 @@
 
 #include <dhcp/option.h>
 #include <util/buffer.h>
-#include <util/io.h>
 
 #include <iostream>
 #include <iterator>
diff --git a/src/lib/dhcp/option4_client_fqdn.cc b/src/lib/dhcp/option4_client_fqdn.cc
index ae2d5b62d9..3cecdca4b2 100644
--- a/src/lib/dhcp/option4_client_fqdn.cc
+++ b/src/lib/dhcp/option4_client_fqdn.cc
@@ -10,7 +10,6 @@
 #include <dhcp/option4_client_fqdn.h>
 #include <dns/labelsequence.h>
 #include <util/buffer.h>
-#include <util/io.h>
 #include <util/str.h>
 #include <sstream>
 
diff --git a/src/lib/dhcp/option4_dnr.cc b/src/lib/dhcp/option4_dnr.cc
index 7f292913ef..2c31662993 100644
--- a/src/lib/dhcp/option4_dnr.cc
+++ b/src/lib/dhcp/option4_dnr.cc
@@ -8,6 +8,8 @@
 
 #include <dhcp/option4_dnr.h>
 #include <dns/labelsequence.h>
+#include <util/io.h>
+#include <util/str.h>
 
 using namespace isc::asiolink;
 using namespace isc::util;
diff --git a/src/lib/dhcp/option4_dnr.h b/src/lib/dhcp/option4_dnr.h
index 02893d4598..97095db3da 100644
--- a/src/lib/dhcp/option4_dnr.h
+++ b/src/lib/dhcp/option4_dnr.h
@@ -16,7 +16,6 @@
 #include <dhcp/option_data_types.h>
 #include <dns/name.h>
 #include <util/encode/utf8.h>
-#include <util/str.h>
 
 #include <map>
 #include <set>
diff --git a/src/lib/dhcp/option6_addrlst.cc b/src/lib/dhcp/option6_addrlst.cc
index 41c4e8dbec..f4657895a8 100644
--- a/src/lib/dhcp/option6_addrlst.cc
+++ b/src/lib/dhcp/option6_addrlst.cc
@@ -11,7 +11,6 @@
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option6_addrlst.h>
 #include <exceptions/exceptions.h>
-#include <util/io.h>
 
 #include <sstream>
 
diff --git a/src/lib/dhcp/option6_client_fqdn.cc b/src/lib/dhcp/option6_client_fqdn.cc
index ba4d056425..9a62bc0aeb 100644
--- a/src/lib/dhcp/option6_client_fqdn.cc
+++ b/src/lib/dhcp/option6_client_fqdn.cc
@@ -10,7 +10,6 @@
 #include <dhcp/option6_client_fqdn.h>
 #include <dns/labelsequence.h>
 #include <util/buffer.h>
-#include <util/io.h>
 #include <util/str.h>
 #include <sstream>
 
diff --git a/src/lib/dhcp/option6_dnr.cc b/src/lib/dhcp/option6_dnr.cc
index e232e376a5..e8a9ffe0bf 100644
--- a/src/lib/dhcp/option6_dnr.cc
+++ b/src/lib/dhcp/option6_dnr.cc
@@ -7,6 +7,7 @@
 #include <config.h>
 
 #include <dhcp/option6_dnr.h>
+#include <util/io.h>
 
 using namespace isc::asiolink;
 using namespace isc::util;
diff --git a/src/lib/dhcp/option6_pdexclude.cc b/src/lib/dhcp/option6_pdexclude.cc
index c4d99f7408..b3ae2066aa 100644
--- a/src/lib/dhcp/option6_pdexclude.cc
+++ b/src/lib/dhcp/option6_pdexclude.cc
@@ -11,7 +11,6 @@
 #include <dhcp/option6_pdexclude.h>
 #include <exceptions/exceptions.h>
 #include <util/encode/encode.h>
-#include <util/io.h>
 
 #include <boost/dynamic_bitset.hpp>
 #include <iostream>
diff --git a/src/lib/dhcp/option6_status_code.cc b/src/lib/dhcp/option6_status_code.cc
index 969192cf07..e53a4e5cd5 100644
--- a/src/lib/dhcp/option6_status_code.cc
+++ b/src/lib/dhcp/option6_status_code.cc
@@ -10,7 +10,6 @@
 #include <dhcp/dhcp6.h>
 #include <dhcp/option6_status_code.h>
 #include <dhcp/option_data_types.h>
-#include <util/io.h>
 #include <iterator>
 #include <sstream>
 
diff --git a/src/lib/dhcp/option_classless_static_route.cc b/src/lib/dhcp/option_classless_static_route.cc
index 6d95df9749..d6cc494065 100644
--- a/src/lib/dhcp/option_classless_static_route.cc
+++ b/src/lib/dhcp/option_classless_static_route.cc
@@ -7,6 +7,7 @@
 #include <config.h>
 
 #include <asiolink/io_error.h>
+#include <util/io.h>
 #include <util/str.h>
 
 #include <option_classless_static_route.h>
diff --git a/src/lib/dhcp/option_custom.h b/src/lib/dhcp/option_custom.h
index 48533d1cad..fa49fa5f69 100644
--- a/src/lib/dhcp/option_custom.h
+++ b/src/lib/dhcp/option_custom.h
@@ -11,7 +11,6 @@
 #include <dhcp/option.h>
 #include <dhcp/option_definition.h>
 #include <exceptions/isc_assert.h>
-#include <util/io.h>
 
 namespace isc {
 namespace dhcp {
diff --git a/src/lib/dhcp/option_data_types.cc b/src/lib/dhcp/option_data_types.cc
index 6be31e8452..24a4fbd789 100644
--- a/src/lib/dhcp/option_data_types.cc
+++ b/src/lib/dhcp/option_data_types.cc
@@ -9,6 +9,7 @@
 #include <dhcp/option_data_types.h>
 #include <dns/labelsequence.h>
 #include <dns/name.h>
+#include <util/io.h>
 #include <util/str.h>
 #include <util/encode/encode.h>
 #include <algorithm>
diff --git a/src/lib/dhcp/option_vendor.cc b/src/lib/dhcp/option_vendor.cc
index bc47935809..cda0363f4d 100644
--- a/src/lib/dhcp/option_vendor.cc
+++ b/src/lib/dhcp/option_vendor.cc
@@ -9,6 +9,8 @@
 #include <dhcp/dhcp4.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp/option_vendor.h>
+#include <util/io.h>
+
 #include <sstream>
 
 using namespace isc::dhcp;
diff --git a/src/lib/dhcp/option_vendor.h b/src/lib/dhcp/option_vendor.h
index 4ba124a1ab..f065ab80dd 100644
--- a/src/lib/dhcp/option_vendor.h
+++ b/src/lib/dhcp/option_vendor.h
@@ -10,7 +10,6 @@
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option.h>
 #include <dhcp/option_data_types.h>
-#include <util/io.h>
 
 #include <stdint.h>
 
diff --git a/src/lib/dhcp/option_vendor_class.cc b/src/lib/dhcp/option_vendor_class.cc
index f2082dc191..8bb729c24d 100644
--- a/src/lib/dhcp/option_vendor_class.cc
+++ b/src/lib/dhcp/option_vendor_class.cc
@@ -9,6 +9,8 @@
 #include <exceptions/exceptions.h>
 #include <dhcp/opaque_data_tuple.h>
 #include <dhcp/option_vendor_class.h>
+#include <util/io.h>
+
 #include <sstream>
 
 namespace isc {
diff --git a/src/lib/dhcp/tests/option_classless_static_route_unittest.cc b/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
index 8eb2775d4a..3da5673beb 100644
--- a/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
+++ b/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
@@ -7,7 +7,6 @@
 #include <config.h>
 
 #include <dhcp/option_classless_static_route.h>
-#include <util/str.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/lib/dhcpsrv/d2_client_mgr.h b/src/lib/dhcpsrv/d2_client_mgr.h
index 356f47768b..5356b61efa 100644
--- a/src/lib/dhcpsrv/d2_client_mgr.h
+++ b/src/lib/dhcpsrv/d2_client_mgr.h
@@ -16,6 +16,7 @@
 #include <dhcpsrv/d2_client_cfg.h>
 #include <dhcpsrv/srv_config.h>
 #include <exceptions/exceptions.h>
+#include <util/str.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/dhcpsrv/lease_mgr.cc b/src/lib/dhcpsrv/lease_mgr.cc
index 38164ce0e4..ab769dd814 100644
--- a/src/lib/dhcpsrv/lease_mgr.cc
+++ b/src/lib/dhcpsrv/lease_mgr.cc
@@ -14,6 +14,7 @@
 #include <exceptions/exceptions.h>
 #include <stats/stats_mgr.h>
 #include <util/encode/encode.h>
+#include <util/str.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
index 6184c76068..a882e3e96f 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
@@ -19,6 +19,7 @@
 #include <hooks/callout_handle.h>
 #include <stats/stats_mgr.h>
 #include <testutils/gtest_utils.h>
+#include <util/str.h>
 
 #if defined HAVE_MYSQL
 #include <mysql/testutils/mysql_schema.h>
diff --git a/src/lib/dhcpsrv/tests/srv_config_unittest.cc b/src/lib/dhcpsrv/tests/srv_config_unittest.cc
index a117d9b825..c53bd2a863 100644
--- a/src/lib/dhcpsrv/tests/srv_config_unittest.cc
+++ b/src/lib/dhcpsrv/tests/srv_config_unittest.cc
@@ -14,6 +14,7 @@
 #include <process/logging_info.h>
 #include <testutils/gtest_utils.h>
 #include <testutils/test_to_element.h>
+#include <util/str.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/lib/log/logger.cc b/src/lib/log/logger.cc
index e8e0f74a98..979637b626 100644
--- a/src/lib/log/logger.cc
+++ b/src/lib/log/logger.cc
@@ -16,8 +16,6 @@
 #include <log/message_dictionary.h>
 #include <log/message_types.h>
 
-#include <util/str.h>
-
 using namespace std;
 
 namespace isc {
diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc
index b5e9c8dc8e..1718f303c9 100644
--- a/src/lib/log/logger_impl.cc
+++ b/src/lib/log/logger_impl.cc
@@ -38,8 +38,6 @@
 #include <log/interprocess/interprocess_sync_file.h>
 #include <log/interprocess/interprocess_sync_null.h>
 
-#include <util/str.h>
-
 // Note: as log4cplus and the Kea logger have many concepts in common, and
 // thus many similar names, to disambiguate types we don't "use" the log4cplus
 // namespace: instead, all log4cplus types are explicitly qualified.
diff --git a/src/lib/process/d_cfg_mgr.cc b/src/lib/process/d_cfg_mgr.cc
index 72bc4dea56..77b3464b76 100644
--- a/src/lib/process/d_cfg_mgr.cc
+++ b/src/lib/process/d_cfg_mgr.cc
@@ -13,7 +13,6 @@
 #include <process/daemon.h>
 #include <process/redact_config.h>
 #include <util/encode/encode.h>
-#include <util/str.h>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/src/lib/tcp/tcp_connection.cc b/src/lib/tcp/tcp_connection.cc
index 0cd3cab51a..d0ec49104e 100644
--- a/src/lib/tcp/tcp_connection.cc
+++ b/src/lib/tcp/tcp_connection.cc
@@ -11,7 +11,6 @@
 #include <tcp/tcp_connection_pool.h>
 #include <tcp/tcp_log.h>
 #include <tcp/tcp_messages.h>
-#include <util/str.h>
 #include <boost/make_shared.hpp>
 
 #include <iomanip>