[#3605] Include what you use on src/bin/dhcp*/dhcp*_srv.cc

src/bin/dhcp4/dhcp4_srv.cc

@@ -7,71 +7,113 @@
 #include <config.h>
 #include <kea_version.h>
 
+#include <asiolink/addr_utilities.h>
+#include <asiolink/io_address.h>
+#include <asiolink/io_service.h>
 #include <asiolink/io_service_mgr.h>
+#include <cc/data.h>
 #include <config/http_command_mgr.h>
+#include <cryptolink/cryptolink.h>
+#include <dhcp/classify.h>
 #include <dhcp/dhcp4.h>
+#include <dhcp/docsis3_option_defs.h>
 #include <dhcp/duid.h>
 #include <dhcp/hwaddr.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcp/libdhcp++.h>
+#include <dhcp/option.h>
 #include <dhcp/option4_addrlst.h>
+#include <dhcp/option4_client_fqdn.h>
 #include <dhcp/option_custom.h>
+#include <dhcp/option_data_types.h>
+#include <dhcp/option_definition.h>
 #include <dhcp/option_int.h>
 #include <dhcp/option_int_array.h>
+#include <dhcp/option_string.h>
 #include <dhcp/option_vendor.h>
 #include <dhcp/option_vendor_class.h>
-#include <dhcp/option_string.h>
+#include <dhcp/pkt.h>
 #include <dhcp/pkt4.h>
 #include <dhcp/pkt4o6.h>
-#include <dhcp/pkt6.h>
-#include <dhcp/docsis3_option_defs.h>
+#include <dhcp/socket_info.h>
+#include <dhcp/std_option_defs.h>
 #include <dhcp4/client_handler.h>
-#include <dhcp4/dhcp4to6_ipc.h>
 #include <dhcp4/dhcp4_log.h>
 #include <dhcp4/dhcp4_srv.h>
-#include <asiolink/addr_utilities.h>
-#include <dhcpsrv/cfgmgr.h>
+#include <dhcp4/dhcp4to6_ipc.h>
+#include <dhcp_ddns/ncr_io.h>
+#include <dhcp_ddns/ncr_msg.h>
+#include <dhcpsrv/alloc_engine.h>
+#include <dhcpsrv/callout_handle_store.h>
+#include <dhcpsrv/cb_ctl_dhcp4.h>
+#include <dhcpsrv/cfg_expiration.h>
+#include <dhcpsrv/cfg_globals.h>
 #include <dhcpsrv/cfg_host_operations.h>
 #include <dhcpsrv/cfg_iface.h>
+#include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/cfg_shared_networks.h>
 #include <dhcpsrv/cfg_subnets4.h>
+#include <dhcpsrv/cfgmgr.h>
+#include <dhcpsrv/client_class_def.h>
+#include <dhcpsrv/d2_client_cfg.h>
+#include <dhcpsrv/d2_client_mgr.h>
 #include <dhcpsrv/dhcpsrv_exceptions.h>
+#include <dhcpsrv/host.h>
 #include <dhcpsrv/host_data_source_factory.h>
 #include <dhcpsrv/host_mgr.h>
-#include <dhcpsrv/lease_mgr.h>
+#include <dhcpsrv/lease.h>
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/ncr_generator.h>
+#include <dhcpsrv/network_state.h>
 #include <dhcpsrv/packet_fuzzer.h>
+#include <dhcpsrv/pool.h>
 #include <dhcpsrv/resource_handler.h>
 #include <dhcpsrv/shared_network.h>
+#include <dhcpsrv/srv_config.h>
 #include <dhcpsrv/subnet.h>
+#include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/subnet_selector.h>
 #include <dhcpsrv/utils.h>
 #include <eval/evaluate.h>
-#include <eval/eval_messages.h>
+#include <eval/token.h>
+#include <exceptions/exceptions.h>
 #include <hooks/callout_handle.h>
 #include <hooks/hooks_log.h>
 #include <hooks/hooks_manager.h>
-#include <stats/stats_mgr.h>
-#include <util/encode/encode.h>
-#include <util/str.h>
-#include <log/interprocess/interprocess_sync_file.h>
+#include <hooks/parking_lots.h>
+#include <hooks/server_hooks.h>
+#include <log/log_dbglevels.h>
+#include <log/log_formatter.h>
 #include <log/logger.h>
-#include <cryptolink/cryptolink.h>
-#include <process/cfgrpt/config_report.h>
+#include <log/macros.h>
+#include <stats/stats_mgr.h>
+#include <util/multi_threading_mgr.h>
+#include <util/optional.h>
+#include <util/readwrite_mutex.h>
+#include <util/thread_pool.h>
+#include <util/triplet.h>
+
+#include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <cstdlib>
+#include <exception>
+#include <functional>
+#include <list>
+#include <map>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
-#include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
-#include <boost/range/adaptor/reversed.hpp>
 #include <boost/pointer_cast.hpp>
+#include <boost/range/adaptor/reversed.hpp>
 #include <boost/shared_ptr.hpp>
 
-
-#include <functional>
-#include <iomanip>
-#include <set>
-#include <cstdlib>
-
 using namespace isc;
 using namespace isc::asiolink;
 using namespace isc::cryptolink;

src/bin/dhcp6/dhcp6_srv.cc

@@ -8,72 +8,113 @@
 #include <kea_version.h>
 
 #include <asiolink/io_address.h>
+#include <asiolink/io_service.h>
 #include <asiolink/io_service_mgr.h>
+#include <cc/data.h>
 #include <config/http_command_mgr.h>
-#include <dhcp_ddns/ncr_msg.h>
+#include <cryptolink/cryptolink.h>
+#include <dhcp/classify.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp/docsis3_option_defs.h>
 #include <dhcp/duid.h>
 #include <dhcp/duid_factory.h>
+#include <dhcp/hwaddr.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcp/libdhcp++.h>
-#include <dhcp/option6_addrlst.h>
+#include <dhcp/opaque_data_tuple.h>
+#include <dhcp/option.h>
 #include <dhcp/option6_client_fqdn.h>
 #include <dhcp/option6_ia.h>
 #include <dhcp/option6_iaaddr.h>
 #include <dhcp/option6_iaprefix.h>
 #include <dhcp/option6_status_code.h>
-#include <dhcp/option6_pdexclude.h>
-#include <dhcp/option_custom.h>
+#include <dhcp/option_int_array.h>
 #include <dhcp/option_vendor.h>
 #include <dhcp/option_vendor_class.h>
-#include <dhcp/option_int_array.h>
+#include <dhcp/pkt.h>
 #include <dhcp/pkt6.h>
+#include <dhcp/std_option_defs.h>
 #include <dhcp6/client_handler.h>
-#include <dhcp6/dhcp6to4_ipc.h>
 #include <dhcp6/dhcp6_log.h>
 #include <dhcp6/dhcp6_srv.h>
+#include <dhcp6/dhcp6to4_ipc.h>
+#include <dhcp_ddns/ncr_io.h>
+#include <dhcp_ddns/ncr_msg.h>
+#include <dhcpsrv/alloc_engine.h>
+#include <dhcpsrv/callout_handle_store.h>
+#include <dhcpsrv/cb_ctl_dhcp6.h>
+#include <dhcpsrv/cfg_expiration.h>
+#include <dhcpsrv/cfg_globals.h>
 #include <dhcpsrv/cfg_host_operations.h>
+#include <dhcpsrv/cfg_mac_source.h>
+#include <dhcpsrv/cfg_option.h>
+#include <dhcpsrv/cfg_shared_networks.h>
+#include <dhcpsrv/cfg_rsoo.h>
+#include <dhcpsrv/cfg_subnets6.h>
 #include <dhcpsrv/cfgmgr.h>
+#include <dhcpsrv/client_class_def.h>
+#include <dhcpsrv/d2_client_cfg.h>
+#include <dhcpsrv/d2_client_mgr.h>
+#include <dhcpsrv/host.h>
 #include <dhcpsrv/host_data_source_factory.h>
 #include <dhcpsrv/host_mgr.h>
-#include <dhcpsrv/lease_mgr.h>
+#include <dhcpsrv/lease.h>
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/ncr_generator.h>
+#include <dhcpsrv/network_state.h>
 #include <dhcpsrv/packet_fuzzer.h>
+#include <dhcpsrv/pool.h>
+#include <dhcpsrv/resource_handler.h>
+#include <dhcpsrv/shared_network.h>
+#include <dhcpsrv/srv_config.h>
 #include <dhcpsrv/subnet.h>
+#include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/subnet_selector.h>
 #include <dhcpsrv/utils.h>
 #include <eval/evaluate.h>
-#include <eval/eval_messages.h>
+#include <eval/token.h>
 #include <exceptions/exceptions.h>
 #include <hooks/callout_handle.h>
 #include <hooks/hooks_log.h>
 #include <hooks/hooks_manager.h>
+#include <hooks/parking_lots.h>
+#include <hooks/server_hooks.h>
+#include <log/log_dbglevels.h>
+#include <log/log_formatter.h>
+#include <log/logger.h>
+#include <log/macros.h>
 #include <stats/stats_mgr.h>
-#include <util/encode/encode.h>
+#include <util/buffer.h>
+#include <util/multi_threading_mgr.h>
+#include <util/optional.h>
 #include <util/pointer_util.h>
-#include <util/range_utilities.h>
-#include <log/interprocess/interprocess_sync_file.h>
-#include <log/logger.h>
-#include <cryptolink/cryptolink.h>
-#include <process/cfgrpt/config_report.h>
-
-#include <boost/tokenizer.hpp>
-#include <boost/foreach.hpp>
-#include <boost/algorithm/string/erase.hpp>
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/split.hpp>
+#include <util/readwrite_mutex.h>
+#include <util/thread_pool.h>
+#include <util/triplet.h>
 
 #include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <cstdlib>
+#include <exception>
 #include <functional>
-#include <stdlib.h>
-#include <time.h>
 #include <iomanip>
-#include <fstream>
-#include <sstream>
+#include <limits>
+#include <list>
 #include <map>
+#include <memory>
 #include <set>
+#include <sstream>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/foreach.hpp>
+#include <boost/tokenizer.hpp>
 
 using namespace isc;
 using namespace isc::asiolink;