[#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 0b5c90c6a51e9abd9a26500ed2e1aa89edd41c4e..0cfa5de2b7156d998bb831a9c2731bff1b566d01 100644 (file)
--- 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 548eaa8b9a5133b856137cc79839091548432a5b..1f21a2f7e01d11b28b05b8760033e1fd64f786e0 100644 (file)
--- 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 62d8df423908c56c286a6152c724c7dd13de993e..207dde7b0b837d076637b4677a4ff56a1cdbb2ce 100644 (file)
--- 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 7c6ebf0579a81b35292a5583aa21f781e075265b..54e63641310766b42bcde9a411c8e3dd43a51537 100644 (file)
--- 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 8256fa2de65d5e529cfbc9e5a32c0afb0cf99796..1d6170d7304785c3947b4ef3bedc611da6569230 100644 (file)
--- 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 13e32037f997fe06b233baaf874432e107245f82..8c86c0052545853b5655c24607bcf58bfb520573 100644 (file)
--- 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 1b1728958d44f64d7ee6bc153e65f27e825ac10c..de19e77a91ccb5daf267e5357185c63f74591757 100644 (file)
--- 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 ef39c58c5d797b454123750c348589a118880309..a98bea92b77898f252fc66c9de18f7783dfceab8 100644 (file)
--- 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 e09f7a78725e830fca32cb00532ab749d43b444b..2673a97b682ee5c7de13580e98aed5e6fc0a1a34 100644 (file)
--- 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 f6dabedb5364ac7f472c6730ec9b9365fbfee75b..03887e367540bced603e39eacd91efaec44b1eae 100644 (file)
--- 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 ae2d5b62d918b55c78a4ac0d866e965cc8c98d99..3cecdca4b28ce87e61829c8e691c2c5175c171d3 100644 (file)
--- 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 7f292913ef014f95f742d7b223d969df593bf6db..2c31662993bcf4bffedfa18cc78831c9bd1f5c6a 100644 (file)
--- 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 02893d45986e09bcfa0978fda1e30a3006a93152..97095db3da073079ed3e31f1638912418377b695 100644 (file)
--- 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 41c4e8dbec300f2b7c43a275e0a23b75b7c996be..f4657895a8d2c77ae51a5f8c08ce02a7efccc738 100644 (file)
--- 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 ba4d056425218c141b1497686bf3c81d78a7100d..9a62bc0aebf3f4c211a4b40e27e08e93d1b23664 100644 (file)
--- 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 e232e376a5f1522fb12a6670aa7c5f75f43afe34..e8a9ffe0bf12f48bd1b2875b38c08c470f4cfb00 100644 (file)
--- 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 c4d99f74083f8f286adeeb99875608769699061c..b3ae2066aaa8dd1108a12e61a0d3432a0363e24f 100644 (file)
--- 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 969192cf0719fb255ba69e0e4fdf55d11f0352e4..e53a4e5cd549be66f77195f3d9a3cdd0d0816fbf 100644 (file)
--- 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 6d95df974977dc93634003d944985c7760ccdd03..d6cc494065f547bcc8ecbf069ca81dbda32f5d9a 100644 (file)
--- 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 48533d1cada8f777c6047b26a9e5f54ba1671332..fa49fa5f69d7a016cb4e0bcd614bde3b4f4aa03b 100644 (file)
--- 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 6be31e8452afc1c825fed30405559e206e5e5d88..24a4fbd789aa3df01238047d17498a33d6378488 100644 (file)
--- 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 bc47935809ad0d15848dbf77bc1ce774573a5575..cda0363f4d033ed4db4b1afa144434bf388fa7b5 100644 (file)
--- 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 4ba124a1aba8f396741c832553488dc88f8cf890..f065ab80ddbfd5914c745c6e0200d50538ae9438 100644 (file)
--- 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 f2082dc191b4a74192ae4524bafb4a0801cd3ed5..8bb729c24dc35a84758c68bd102310f26dba12b4 100644 (file)
--- 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 8eb2775d4ae24bf4f257e96115aa9bd09b02b9fb..3da5673bebb4736146602f60d9c5f9f329ef17c8 100644 (file)
--- 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 356f47768b86ee216d2df56ffdd3e5f64080ceaa..5356b61efa85b915be19abe10ec3452f12e2bad1 100644 (file)
--- 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 38164ce0e4383ca04bced3f3fc415589b54bc5ce..ab769dd814f7b2f95a34e572a7566a7ddce16c2e 100644 (file)
--- 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 6184c76068dcb5bd3e9873303fbffe3f29dc62d1..a882e3e96fe36366796fc104695c65df6834c677 100644 (file)
--- 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 a117d9b82515021eaca0343f6abb93337ccc39a2..c53bd2a8638760b18a278c32578bf3a8de32f656 100644 (file)
--- 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 e8e0f74a9849f8276dd5c6bdfa8fe3a09dcb1514..979637b626c078c232675259f162c908420664b1 100644 (file)
--- 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 b5e9c8dc8e4349b40d24b81f17defaaaf4c36df3..1718f303c972c5002fb570752c45811219caabf7 100644 (file)
--- 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 72bc4dea56bb55f6b7bfad66992eda912b37dbed..77b3464b7665d2c0c7b74f73e6094e98524cd383 100644 (file)
--- 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 0cd3cab51a9271f127725d422648ac82051667c1..d0ec49104e5b1022fb5122d19056ab621467324e 100644 (file)
--- 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>