[#1602] remove duplicate includes

diff --git a/src/bin/d2/tests/d2_queue_mgr_unittests.cc b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
index 68e9916424b236621092b7b37922194e2f4b10ef..a00de29f4bd7013a23efebd3596798740a91627d 100644 (file)
--- a/src/bin/d2/tests/d2_queue_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
@@ -12,7 +12,6 @@
 #include <dhcp_ddns/ncr_udp.h>
 #include <util/time_utilities.h>
 
-#include <gtest/gtest.h>
 #include <gtest/gtest.h>
 #include <algorithm>
 #include <functional>

diff --git a/src/bin/d2/tests/d2_update_mgr_unittests.cc b/src/bin/d2/tests/d2_update_mgr_unittests.cc
index 8ab2b246e9dc6270a0bab082ea3bf3c89b58f7c5..c78c4f4dad1b5c4ebeba308e832731bc82a456cd 100644 (file)
--- a/src/bin/d2/tests/d2_update_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_update_mgr_unittests.cc
@@ -11,13 +11,11 @@
 #include <nc_test_utils.h>
 #include <d2/nc_add.h>
 #include <d2/nc_remove.h>
-#include <d2/nc_remove.h>
 #include <d2/simple_add.h>
 #include <d2/simple_remove.h>
 #include <process/testutils/d_test_stubs.h>
 #include <util/time_utilities.h>
 
-#include <gtest/gtest.h>
 #include <gtest/gtest.h>
 #include <algorithm>
 #include <vector>
@@ -680,8 +678,8 @@ TEST_F(D2UpdateMgrTest, addTransaction) {
     ASSERT_TRUE (pos != update_mgr_->transactionListEnd());
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
-   
-    // Verify the correct type of transaction was created. 
+
+    // Verify the correct type of transaction was created.
     NameAddTransaction* t = dynamic_cast<NameAddTransaction*>(trans.get());
     ASSERT_TRUE(t);
 
@@ -738,7 +736,7 @@ TEST_F(D2UpdateMgrTest, removeTransaction) {
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
 
-    // Verify the correct type of transaction was created. 
+    // Verify the correct type of transaction was created.
     NameRemoveTransaction* t = dynamic_cast<NameRemoveTransaction*>(trans.get());
     ASSERT_TRUE(t);
 
@@ -896,8 +894,8 @@ TEST_F(D2UpdateMgrTest, simpleAddTransaction) {
     ASSERT_TRUE (pos != update_mgr_->transactionListEnd());
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
-   
-    // Verify the correct type of transaction was created. 
+
+    // Verify the correct type of transaction was created.
     SimpleAddTransaction* t = dynamic_cast<SimpleAddTransaction*>(trans.get());
     ASSERT_TRUE(t);
 
@@ -955,7 +953,7 @@ TEST_F(D2UpdateMgrTest, simpleRemoveTransaction) {
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
 
-    // Verify the correct type of transaction was created. 
+    // Verify the correct type of transaction was created.
     SimpleRemoveTransaction* t = dynamic_cast<SimpleRemoveTransaction*>(trans.get());
     ASSERT_TRUE(t);
 

diff --git a/src/bin/d2/tests/nc_add_unittests.cc b/src/bin/d2/tests/nc_add_unittests.cc
index 67d11d1903b627698c5590c11f9d417cf079113a..a6a906478ae8a7fc133b1664b03107fb5b5ec5f6 100644 (file)
--- a/src/bin/d2/tests/nc_add_unittests.cc
+++ b/src/bin/d2/tests/nc_add_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/nc_add.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>

diff --git a/src/bin/d2/tests/nc_remove_unittests.cc b/src/bin/d2/tests/nc_remove_unittests.cc
index e19000460aa2aa12314c64f3493a4773962103e6..4a1ee5c22dfb4f1605758304a5ef52319683cfea 100644 (file)
--- a/src/bin/d2/tests/nc_remove_unittests.cc
+++ b/src/bin/d2/tests/nc_remove_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/nc_remove.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>

diff --git a/src/bin/d2/tests/simple_add_unittests.cc b/src/bin/d2/tests/simple_add_unittests.cc
index a9cda70d8bf9502013ff9c34ca9b99893c89abe1..2d7a884c4efc6d58e4aca5300482c440c1aa4701 100644 (file)
--- a/src/bin/d2/tests/simple_add_unittests.cc
+++ b/src/bin/d2/tests/simple_add_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/simple_add.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>

diff --git a/src/bin/d2/tests/simple_remove_unittests.cc b/src/bin/d2/tests/simple_remove_unittests.cc
index f86e3eaff58bb42974197e9e67f5f5d31065eeb5..2e4238e5533bea026d4c46b0dd7e85cd59702881 100644 (file)
--- a/src/bin/d2/tests/simple_remove_unittests.cc
+++ b/src/bin/d2/tests/simple_remove_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/simple_remove.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>

diff --git a/src/bin/dhcp4/tests/hooks_unittest.cc b/src/bin/dhcp4/tests/hooks_unittest.cc
index 79c5cae8b8f09eb54de1d3e0929a5d1f3fd2ad58..ed51ae97846dd495e62ad1cac71cd7b1e7b4024a 100644 (file)
--- a/src/bin/dhcp4/tests/hooks_unittest.cc
+++ b/src/bin/dhcp4/tests/hooks_unittest.cc
@@ -7,7 +7,6 @@
 #include <config.h>
 
 #include <dhcp4/tests/dhcp4_test_utils.h>
-#include <dhcp4/tests/dhcp4_client.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>
 #include <asiolink/io_service.h>

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index e3e4121e9357ac0c977a62c2d7421de0ed715541..8c7b25c70b4e6afdd40502865634f504d72e0528 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -43,7 +43,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <fstream>
 #include <sstream>
 #include <string>
 #include <vector>

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 192c7aed81f45728deaabf59ca3640092921d891..e516279cc07cabfdf3ab95f01e9da3a5e832d135 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -18,7 +18,6 @@
 #include <dhcp/option_string.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcp6/json_config_parser.h>
-#include <dhcp/dhcp6.h>
 #include <dhcp/docsis3_option_defs.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
@@ -30,11 +29,11 @@
 #include <util/range_utilities.h>
 #include <util/encode/hex.h>
 #include <stats/stats_mgr.h>
-
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/dhcp6_client.h>
 #include <dhcp/tests/pkt_captures.h>
 #include <cc/command_interpreter.h>
+
 #include <boost/pointer_cast.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>

diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 8fc2cc145a11740df65b4a572213a035a9886952..46ba9b8e9db7b056b1578f3a15e25192f76170ef 100644 (file)
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -11,7 +11,6 @@
 #include <cc/simple_parser.h>
 #include <cc/cfg_to_element.h>
 #include <testutils/user_context_utils.h>
-#include <testutils/user_context_utils.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/parsers/simple_parser6.h>

diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index 7f29e135d8b1356f45de7576059d01c3a7a83a77..2629fcda68671a0550269eb39005adc184bce74d 100644 (file)
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -11,7 +11,6 @@
 #include <dhcp/dhcp6.h>
 #include <dhcp/duid.h>
 #include <dhcp6/json_config_parser.h>
-#include <dhcp/dhcp6.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/lease_mgr.h>
 #include <dhcpsrv/lease_mgr_factory.h>
@@ -20,7 +19,6 @@
 #include <util/range_utilities.h>
 #include <hooks/server_hooks.h>
 #include <hooks/callout_manager.h>
-
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/dhcp6_client.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>

diff --git a/src/hooks/dhcp/high_availability/communication_state.cc b/src/hooks/dhcp/high_availability/communication_state.cc
index 76eb2a13316fd59bad478c1b66778cc76d595b1c..af9036ea20bc575136d87372ce17b8d8a3a33d84 100644 (file)
--- a/src/hooks/dhcp/high_availability/communication_state.cc
+++ b/src/hooks/dhcp/high_availability/communication_state.cc
@@ -7,7 +7,6 @@
 #include <config.h>
 
 #include <communication_state.h>
-#include <exceptions/exceptions.h>
 #include <ha_log.h>
 #include <ha_service_states.h>
 #include <cc/data.h>

diff --git a/src/hooks/dhcp/high_availability/ha_service.h b/src/hooks/dhcp/high_availability/ha_service.h
index 29eafcab02d3d2e94382a8d563d8a74fef88de9f..6558b98ceee13b2e5b2752e2f7c932dfcf8af9b4 100644 (file)
--- a/src/hooks/dhcp/high_availability/ha_service.h
+++ b/src/hooks/dhcp/high_availability/ha_service.h
@@ -15,12 +15,12 @@
 #include <cc/data.h>
 #include <dhcp/pkt4.h>
 #include <http/response.h>
-#include <dhcp/pkt4.h>
 #include <dhcpsrv/lease.h>
 #include <dhcpsrv/network_state.h>
 #include <hooks/parking_lots.h>
 #include <http/client.h>
 #include <util/state_model.h>
+
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <functional>

diff --git a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
index 1fea795fcb9fd4d6d084bca41bc83eb39c25a44a..adc791e954576b26ba73b07835f66b91959f810c 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
+++ b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
@@ -5,7 +5,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-
 #include <config.h>
 
 #include <exceptions/exceptions.h>
@@ -16,7 +15,6 @@
 #include <dhcpsrv/cfgmgr.h>
 #include <cc/command_interpreter.h>
 #include <cc/data.h>
-#include <cc/data.h>
 #include <stats/stats_mgr.h>
 
 #include <boost/date_time/posix_time/posix_time.hpp>

diff --git a/src/lib/dhcp/pkt4.h b/src/lib/dhcp/pkt4.h
index 26ded314f1e79a7df6913d3dbea0f2eef516f5ff..9613f3af78f4f605f4d6c61a7087bbd1e2f8c745 100644 (file)
--- a/src/lib/dhcp/pkt4.h
+++ b/src/lib/dhcp/pkt4.h
@@ -8,7 +8,6 @@
 #define PKT4_H
 
 #include <asiolink/io_address.h>
-#include <dhcp/option.h>
 #include <dhcp/duid.h>
 #include <util/buffer.h>
 #include <dhcp/option.h>

diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 16db32afcf4b338242748973a7b5b4d8ac9f08df..79cc8d54c9d03a7bbf19c73aa9f30ad3aa3ffbe3 100644 (file)
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -29,7 +29,6 @@
 #include <util/encode/hex.h>
 #include <util/stopwatch.h>
 #include <hooks/server_hooks.h>
-#include <hooks/hooks_manager.h>
 
 #include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>

diff --git a/src/lib/dhcpsrv/tests/alloc_engine_utils.cc b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
index 03d224bfcb9cf7aeaf15c20a523205fcd9615eff..2ca911578e063ca53de2bf3f32c99b6317b3e6f3 100644 (file)
--- a/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
@@ -21,8 +21,6 @@
 #include <dhcpsrv/testutils/test_utils.h>
 #include <dhcpsrv/tests/alloc_engine_utils.h>
 
-#include <hooks/hooks_manager.h>
-
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 

diff --git a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
index bd07c450c9f9d5057f3335ac50952befbb85a661..accf43a9891917849ae67a9fae5e0731ebde1733 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <dhcp/classify.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option_custom.h>
@@ -15,14 +16,12 @@
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
-#include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/cfg_shared_networks.h>
 #include <dhcpsrv/cfg_subnets4.h>
 #include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/subnet_selector.h>
-#include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_hosts.h>
 #include <stats/stats_mgr.h>
 #include <testutils/gtest_utils.h>

diff --git a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
index a2c940b1da7d1c194ec3f8537cff178f043de599..9d928c5ab0e22d0746897a5e3e2468725051d2d9 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <dhcp/classify.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp/option.h>
@@ -18,7 +19,6 @@
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/subnet_selector.h>
-#include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_hosts.h>
 #include <stats/stats_mgr.h>
 #include <testutils/gtest_utils.h>

diff --git a/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc b/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc
index e3c9d010f6bf7a0ddf23ecc4632375e4ed18e5ba..4fbb2a4dab0b26b91dcf0e225ab08bf187e0873b 100644 (file)
--- a/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc
@@ -5,8 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <dhcp/iface_mgr.h>
-#include <dhcp/option_vendor.h>
 #include <dhcp/pkt6.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcp/option6_addrlst.h>
@@ -15,6 +15,7 @@
 #include <dhcp/option_int.h>
 #include <dhcpsrv/dhcp4o6_ipc.h>
 #include <dhcpsrv/testutils/dhcp4o6_test_ipc.h>
+
 #include <gtest/gtest.h>
 #include <functional>
 #include <sstream>

diff --git a/src/lib/dhcpsrv/tests/subnet_unittest.cc b/src/lib/dhcpsrv/tests/subnet_unittest.cc
index 461edb80afe31052d214fa4070495ada4ba3ff83..1eb4d2965d10403417da83ba649ffbfedeb1870e 100644 (file)
--- a/src/lib/dhcpsrv/tests/subnet_unittest.cc
+++ b/src/lib/dhcpsrv/tests/subnet_unittest.cc
@@ -13,7 +13,6 @@
 #include <dhcp/option.h>
 #include <dhcp/option_custom.h>
 #include <dhcp/option_definition.h>
-#include <dhcp/dhcp6.h>
 #include <dhcp/option_space.h>
 #include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/subnet.h>

diff --git a/src/lib/eval/tests/context_unittest.cc b/src/lib/eval/tests/context_unittest.cc
index 1670487747e1e0bb32fb62ae14f4598836571164..3756d41f542c1eaba5d5ca78bf6dec83fcc59717 100644 (file)
--- a/src/lib/eval/tests/context_unittest.cc
+++ b/src/lib/eval/tests/context_unittest.cc
@@ -5,7 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <eval/token.h>
+
 #include <eval/eval_context.h>
 #include <eval/token.h>
 #include <dhcp/option.h>

diff --git a/src/lib/hooks/hooks_manager.cc b/src/lib/hooks/hooks_manager.cc
index 5c8985c071538dab1efee7bd1fa36fe2e5cb76a5..82b741ed25dad5cd8fb533145a33159b46a1e4ef 100644 (file)
--- a/src/lib/hooks/hooks_manager.cc
+++ b/src/lib/hooks/hooks_manager.cc
@@ -8,7 +8,6 @@
 
 #include <hooks/callout_handle.h>
 #include <hooks/callout_manager.h>
-#include <hooks/callout_manager.h>
 #include <hooks/library_handle.h>
 #include <hooks/library_manager_collection.h>
 #include <hooks/hooks_manager.h>

diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc
index 8742d9109dcca30f1b25b66e073ba0911ec69534..a03d2bd5b5c4a1590ee99e53501dfce06d6c5a40 100644 (file)
--- a/src/lib/log/logger_manager.cc
+++ b/src/lib/log/logger_manager.cc
@@ -19,7 +19,6 @@
 #include <log/message_dictionary.h>
 #include <log/message_exception.h>
 #include <log/message_initializer.h>
-#include <log/message_initializer.h>
 #include <log/message_reader.h>
 #include <log/message_types.h>
 #include <log/interprocess/interprocess_sync_null.h>

diff --git a/src/lib/log/message_reader.cc b/src/lib/log/message_reader.cc
index f5b0d3907c9707bfce79bdb593bc4c370a254faf..834881adfd92bd49703aa69a207b6a5114cb8f2f 100644 (file)
--- a/src/lib/log/message_reader.cc
+++ b/src/lib/log/message_reader.cc
@@ -8,7 +8,6 @@
 
 #include <errno.h>
 #include <string.h>
-#include <iostream>
 
 #include <iostream>
 #include <fstream>

diff --git a/tools/check-for-duplicate-includes.sh b/tools/check-for-duplicate-includes.sh
index 60d85acc82687f727dc1aa45d64c7c6651b9ec0f..67a2c595420e80a36ac744445246e685540be73b 100755 (executable)
--- a/tools/check-for-duplicate-includes.sh
+++ b/tools/check-for-duplicate-includes.sh
@@ -102,6 +102,11 @@ root_path=$(cd "$(dirname "${0}")/.." && pwd)
 
 # Generated files will be filtered out. Hardcoded list
 filtered_out=$(cat "${root_path}/tools/.generated-files.txt")
+# src/lib/asiolink/asio_wrapper.h includes <boost/asio.hpp> in both
+# conditionals of an #ifdef. Make an exception for it.
+filtered_out="${filtered_out}
+src/lib/asiolink/asio_wrapper.h
+"
 
 found=false
 for i in $(get_source_files); do