[#3210] clean up some header includes

Author: andrei-pavel

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>

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>

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>

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>

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>

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>
 

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>

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>

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 {

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>

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>
 

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;

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>

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>
 

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>
 

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;

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>

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>
 

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>

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 {

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>

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;

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>
 

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 {

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>
 

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>

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>
 

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>

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>
 

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 {

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.

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>

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>