Revert "[5521] Missing config.h includes added"

This reverts commit 26a40b480c6b427973402613fda290ad249efddd.

75 files changed, 0 insertions, 150 deletions

diff --git a/src/bin/agent/agent_lexer.cc b/src/bin/agent/agent_lexer.cc
index 496b080013..3a386d84a7 100644
--- a/src/bin/agent/agent_lexer.cc
+++ b/src/bin/agent/agent_lexer.cc
@@ -294,8 +294,6 @@
 
 /* begin standard C headers. */
 /* %if-c-only */
-#include <config.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc
index 42e8266add..4ce4ea98cf 100644
--- a/src/bin/agent/agent_parser.cc
+++ b/src/bin/agent/agent_parser.cc
@@ -45,8 +45,6 @@
 #  endif
 # endif
 
-#include <config.h>
-
 #include "agent_parser.h"
 
 // User implementation prologue.
diff --git a/src/bin/agent/ca_command_mgr.cc b/src/bin/agent/ca_command_mgr.cc
index db8231c573..85e998db61 100644
--- a/src/bin/agent/ca_command_mgr.cc
+++ b/src/bin/agent/ca_command_mgr.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <agent/ca_cfg_mgr.h>
 #include <agent/ca_command_mgr.h>
 #include <agent/ca_controller.h>
diff --git a/src/bin/agent/ca_log.cc b/src/bin/agent/ca_log.cc
index 6564a07735..7c9147c8b3 100644
--- a/src/bin/agent/ca_log.cc
+++ b/src/bin/agent/ca_log.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <agent/ca_log.h>
 
 namespace isc {
diff --git a/src/bin/agent/ca_response_creator.cc b/src/bin/agent/ca_response_creator.cc
index a6ccb525e6..5eb85170a9 100644
--- a/src/bin/agent/ca_response_creator.cc
+++ b/src/bin/agent/ca_response_creator.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <agent/ca_command_mgr.h>
 #include <agent/ca_response_creator.h>
 #include <cc/data.h>
diff --git a/src/bin/agent/parser_context.cc b/src/bin/agent/parser_context.cc
index 2efcd5808b..946ce71e17 100644
--- a/src/bin/agent/parser_context.cc
+++ b/src/bin/agent/parser_context.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <agent/parser_context.h>
 #include <agent/agent_parser.h>
 #include <exceptions/exceptions.h>
diff --git a/src/bin/agent/simple_parser.cc b/src/bin/agent/simple_parser.cc
index 807b7c7d52..39d182f829 100644
--- a/src/bin/agent/simple_parser.cc
+++ b/src/bin/agent/simple_parser.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <agent/simple_parser.h>
 #include <cc/data.h>
 #include <cc/dhcp_config_error.h>
diff --git a/src/bin/agent/tests/ca_unittests.cc b/src/bin/agent/tests/ca_unittests.cc
index 7b4ad44316..44132a47a3 100644
--- a/src/bin/agent/tests/ca_unittests.cc
+++ b/src/bin/agent/tests/ca_unittests.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <log/logger_support.h>
 #include <gtest/gtest.h>
 
diff --git a/src/bin/agent/tests/parser_unittests.cc b/src/bin/agent/tests/parser_unittests.cc
index 421c4e3e57..c7d8fb7c3b 100644
--- a/src/bin/agent/tests/parser_unittests.cc
+++ b/src/bin/agent/tests/parser_unittests.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <gtest/gtest.h>
 #include <cc/data.h>
 #include <agent/parser_context.h>
diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc
index b56cee1276..915f94cab7 100644
--- a/src/bin/d2/d2_lexer.cc
+++ b/src/bin/d2/d2_lexer.cc
@@ -294,8 +294,6 @@
 
 /* begin standard C headers. */
 /* %if-c-only */
-#include <config.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/bin/d2/d2_parser.cc b/src/bin/d2/d2_parser.cc
index 88df59bf73..11d8cbc5e6 100644
--- a/src/bin/d2/d2_parser.cc
+++ b/src/bin/d2/d2_parser.cc
@@ -45,8 +45,6 @@
 #  endif
 # endif
 
-#include <config.h>
-
 #include "d2_parser.h"
 
 // User implementation prologue.
diff --git a/src/bin/d2/d2_simple_parser.cc b/src/bin/d2/d2_simple_parser.cc
index 7c1453303c..8e1d0469d0 100644
--- a/src/bin/d2/d2_simple_parser.cc
+++ b/src/bin/d2/d2_simple_parser.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <d2/d2_config.h>
 #include <d2/d2_simple_parser.h>
 #include <cc/data.h>
diff --git a/src/bin/d2/parser_context.cc b/src/bin/d2/parser_context.cc
index e38d0c47b9..54a136bd6e 100644
--- a/src/bin/d2/parser_context.cc
+++ b/src/bin/d2/parser_context.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <d2/d2_parser.h>
 #include <d2/parser_context.h>
 #include <exceptions/exceptions.h>
diff --git a/src/bin/d2/tests/parser_unittest.cc b/src/bin/d2/tests/parser_unittest.cc
index 2bb62543f6..9ecd663451 100644
--- a/src/bin/d2/tests/parser_unittest.cc
+++ b/src/bin/d2/tests/parser_unittest.cc
@@ -3,8 +3,6 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include <config.h>
-
 #include <gtest/gtest.h>
 #include <cc/data.h>
 #include <d2/parser_context.h>
diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index eb15f3c77a..63aa9cf038 100644
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -56,8 +56,6 @@
 
 /* begin standard C headers. */
 /* %if-c-only */
-#include <config.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index b2636e62a8..cb76fa5bab 100644
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -45,8 +45,6 @@
 #  endif
 # endif
 
-#include <config.h>
-
 #include "dhcp4_parser.h"
 
 // User implementation prologue.
diff --git a/src/bin/dhcp4/parser_context.cc b/src/bin/dhcp4/parser_context.cc
index de28969fb6..d160a2f6c7 100644
--- a/src/bin/dhcp4/parser_context.cc
+++ b/src/bin/dhcp4/parser_context.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <dhcp4/parser_context.h>
 #include <dhcp4/dhcp4_parser.h>
 #include <exceptions/exceptions.h>
diff --git a/src/bin/dhcp4/tests/callout_library_3.cc b/src/bin/dhcp4/tests/callout_library_3.cc
index fdd1730fc1..4adafb09a6 100644
--- a/src/bin/dhcp4/tests/callout_library_3.cc
+++ b/src/bin/dhcp4/tests/callout_library_3.cc
@@ -9,8 +9,6 @@
 /// hook point.
 ///
 static const int LIBRARY_NUMBER = 3;
-#include <config.h>
-
 #include <dhcp4/tests/callout_library_common.h>
 #include <string>
 #include <vector>
diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index b9eefc3467..b73cf22578 100644
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <gtest/gtest.h>
 #include <cc/data.h>
 #include <dhcp4/parser_context.h>
diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc
index 34d9944f14..25d548e897 100644
--- a/src/bin/dhcp6/dhcp6_lexer.cc
+++ b/src/bin/dhcp6/dhcp6_lexer.cc
@@ -56,8 +56,6 @@
 
 /* begin standard C headers. */
 /* %if-c-only */
-#include <config.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc
index c6b49c9d3d..cc4ce305f0 100644
--- a/src/bin/dhcp6/dhcp6_parser.cc
+++ b/src/bin/dhcp6/dhcp6_parser.cc
@@ -45,8 +45,6 @@
 #  endif
 # endif
 
-#include <config.h>
-
 #include "dhcp6_parser.h"
 
 // User implementation prologue.
diff --git a/src/bin/dhcp6/parser_context.cc b/src/bin/dhcp6/parser_context.cc
index f76df94ed3..0ed107886f 100644
--- a/src/bin/dhcp6/parser_context.cc
+++ b/src/bin/dhcp6/parser_context.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <dhcp6/parser_context.h>
 #include <dhcp6/dhcp6_parser.h>
 #include <exceptions/exceptions.h>
diff --git a/src/bin/dhcp6/tests/callout_library_3.cc b/src/bin/dhcp6/tests/callout_library_3.cc
index b268aedde1..3305ac1ce6 100644
--- a/src/bin/dhcp6/tests/callout_library_3.cc
+++ b/src/bin/dhcp6/tests/callout_library_3.cc
@@ -9,8 +9,6 @@
 /// hook point.
 ///
 static const int LIBRARY_NUMBER = 3;
-#include <config.h>
-
 #include <dhcp6/tests/callout_library_common.h>
 #include <string>
 #include <vector>
diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc
index 65a7e3591a..a83e4a1b1a 100644
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <gtest/gtest.h>
 #include <cc/data.h>
 #include <dhcp6/parser_context.h>
diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_callouts.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_callouts.cc
index 97912ce71e..8c18da45e8 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_callouts.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_callouts.cc
@@ -8,8 +8,6 @@
 // mangling that accompanies use of the C++ compiler as well as to avoid
 // issues related to namespaces.
 
-#include <config.h>
-
 #include <lease_cmds.h>
 #include <lease_cmds_log.h>
 #include <cc/command_interpreter.h>
diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_log.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_log.cc
index 7622a9c89d..8215a6effa 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_log.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_log.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <lease_cmds_log.h>
 
 namespace isc {
diff --git a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
index 04b3252695..535fc9803a 100644
--- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <hooks/hooks_manager.h>
 #include <config/command_mgr.h>
diff --git a/src/hooks/dhcp/lease_cmds/tests/run_unittests.cc b/src/hooks/dhcp/lease_cmds/tests/run_unittests.cc
index 4c87f80c8a..600d522379 100644
--- a/src/hooks/dhcp/lease_cmds/tests/run_unittests.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/run_unittests.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <log/logger_support.h>
 #include <gtest/gtest.h>
 
diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds_callouts.cc b/src/hooks/dhcp/stat_cmds/stat_cmds_callouts.cc
index be210486e5..768ff05d00 100644
--- a/src/hooks/dhcp/stat_cmds/stat_cmds_callouts.cc
+++ b/src/hooks/dhcp/stat_cmds/stat_cmds_callouts.cc
@@ -8,8 +8,6 @@
 // mangling that accompanies use of the C++ compiler as well as to avoid
 // issues related to namespaces.
 
-#include <config.h>
-
 #include <stat_cmds.h>
 #include <stat_cmds_log.h>
 #include <cc/command_interpreter.h>
diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds_log.cc b/src/hooks/dhcp/stat_cmds/stat_cmds_log.cc
index 1b985a6640..8b257da7b3 100644
--- a/src/hooks/dhcp/stat_cmds/stat_cmds_log.cc
+++ b/src/hooks/dhcp/stat_cmds/stat_cmds_log.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <stat_cmds_log.h>
 
 namespace isc {
diff --git a/src/hooks/dhcp/stat_cmds/tests/run_unittests.cc b/src/hooks/dhcp/stat_cmds/tests/run_unittests.cc
index f5014ce44f..096485fb7a 100644
--- a/src/hooks/dhcp/stat_cmds/tests/run_unittests.cc
+++ b/src/hooks/dhcp/stat_cmds/tests/run_unittests.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <log/logger_support.h>
 #include <gtest/gtest.h>
 
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 46d1e54595..4e8a8a0489 100644
--- a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
+++ b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
@@ -6,8 +6,6 @@
 //
 
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <hooks/hooks_manager.h>
 #include <config/command_mgr.h>
diff --git a/src/lib/asiolink/testutils/test_server_unix_socket.cc b/src/lib/asiolink/testutils/test_server_unix_socket.cc
index 02d30bb5e4..c72b1270d7 100644
--- a/src/lib/asiolink/testutils/test_server_unix_socket.cc
+++ b/src/lib/asiolink/testutils/test_server_unix_socket.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <asiolink/testutils/test_server_unix_socket.h>
 #include <boost/bind.hpp>
diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc
index d32684f067..af6f4cd9ba 100644
--- a/src/lib/asiolink/unix_domain_socket.cc
+++ b/src/lib/asiolink/unix_domain_socket.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <asiolink/unix_domain_socket.h>
 #include <boost/bind.hpp>
diff --git a/src/lib/cc/json_feed.cc b/src/lib/cc/json_feed.cc
index 3ea8040615..269d896c3a 100644
--- a/src/lib/cc/json_feed.cc
+++ b/src/lib/cc/json_feed.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <cc/data.h>
 #include <cc/json_feed.h>
 #include <boost/bind.hpp>
diff --git a/src/lib/cc/simple_parser.cc b/src/lib/cc/simple_parser.cc
index 38b5e1368d..a8defad781 100644
--- a/src/lib/cc/simple_parser.cc
+++ b/src/lib/cc/simple_parser.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <cc/simple_parser.h>
 #include <asiolink/io_address.h>
 #include <boost/foreach.hpp>
diff --git a/src/lib/cc/tests/simple_parser_unittest.cc b/src/lib/cc/tests/simple_parser_unittest.cc
index ae2fc17633..9febfe868e 100644
--- a/src/lib/cc/tests/simple_parser_unittest.cc
+++ b/src/lib/cc/tests/simple_parser_unittest.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <stdint.h>
 #include <cc/simple_parser.h>
 #include <gtest/gtest.h>
diff --git a/src/lib/cc/user_context.cc b/src/lib/cc/user_context.cc
index 74104006ef..e4e2399198 100644
--- a/src/lib/cc/user_context.cc
+++ b/src/lib/cc/user_context.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <cc/user_context.h>
 
 using namespace isc::data;
diff --git a/src/lib/config/base_command_mgr.cc b/src/lib/config/base_command_mgr.cc
index 17d058a804..2bca336174 100644
--- a/src/lib/config/base_command_mgr.cc
+++ b/src/lib/config/base_command_mgr.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <cc/command_interpreter.h>
 #include <config/base_command_mgr.h>
 #include <config/config_log.h>
diff --git a/src/lib/config/client_connection.cc b/src/lib/config/client_connection.cc
index e140568443..2045d263e4 100644
--- a/src/lib/config/client_connection.cc
+++ b/src/lib/config/client_connection.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <asiolink/interval_timer.h>
 #include <asiolink/unix_domain_socket.h>
diff --git a/src/lib/config/hooked_command_mgr.cc b/src/lib/config/hooked_command_mgr.cc
index 9238ed9975..c7c2e3df2b 100644
--- a/src/lib/config/hooked_command_mgr.cc
+++ b/src/lib/config/hooked_command_mgr.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <cc/command_interpreter.h>
 #include <config/hooked_command_mgr.h>
 #include <config/config_log.h>
diff --git a/src/lib/dhcpsrv/cfg_4o6.cc b/src/lib/dhcpsrv/cfg_4o6.cc
index 9a6ee8a1b7..206298124f 100644
--- a/src/lib/dhcpsrv/cfg_4o6.cc
+++ b/src/lib/dhcpsrv/cfg_4o6.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <dhcp/option.h>
 #include <dhcpsrv/cfg_4o6.h>
 #include <string>
diff --git a/src/lib/dhcpsrv/cfg_hosts_util.cc b/src/lib/dhcpsrv/cfg_hosts_util.cc
index d21a287815..5798bf51d2 100644
--- a/src/lib/dhcpsrv/cfg_hosts_util.cc
+++ b/src/lib/dhcpsrv/cfg_hosts_util.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <cc/data.h>
 #include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/cfg_hosts_util.h>
diff --git a/src/lib/dhcpsrv/db_log.cc b/src/lib/dhcpsrv/db_log.cc
index f2e3cd0a42..c41664524f 100644
--- a/src/lib/dhcpsrv/db_log.cc
+++ b/src/lib/dhcpsrv/db_log.cc
@@ -6,8 +6,6 @@
 
 /// Defines the logger used by the NSAS
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/db_log.h>
 #include <dhcpsrv/dhcpsrv_db_log.h>
diff --git a/src/lib/dhcpsrv/dhcpsrv_db_log.cc b/src/lib/dhcpsrv/dhcpsrv_db_log.cc
index 013d8c469d..b39585edd6 100644
--- a/src/lib/dhcpsrv/dhcpsrv_db_log.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_db_log.cc
@@ -6,8 +6,6 @@
 
 /// Defines the logger used by the NSAS
 
-#include <config.h>
-
 #include <dhcpsrv/dhcpsrv_db_log.h>
 #include <dhcpsrv/dhcpsrv_log.h>
 
diff --git a/src/lib/dhcpsrv/network.cc b/src/lib/dhcpsrv/network.cc
index 4a1136bb0a..fbd7d35539 100644
--- a/src/lib/dhcpsrv/network.cc
+++ b/src/lib/dhcpsrv/network.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <dhcp/dhcp4.h>
 #include <dhcp/option_custom.h>
 #include <dhcp/option_space.h>
diff --git a/src/lib/dhcpsrv/network_state.cc b/src/lib/dhcpsrv/network_state.cc
index a13cc609f3..fdf5d17f6c 100644
--- a/src/lib/dhcpsrv/network_state.cc
+++ b/src/lib/dhcpsrv/network_state.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/network_state.h>
 #include <dhcpsrv/timer_mgr.h>
diff --git a/src/lib/dhcpsrv/parsers/option_data_parser.cc b/src/lib/dhcpsrv/parsers/option_data_parser.cc
index 9f4e138560..27fd9ab41f 100644
--- a/src/lib/dhcpsrv/parsers/option_data_parser.cc
+++ b/src/lib/dhcpsrv/parsers/option_data_parser.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option_definition.h>
diff --git a/src/lib/dhcpsrv/parsers/shared_network_parser.cc b/src/lib/dhcpsrv/parsers/shared_network_parser.cc
index 2e77490f9a..693b0f271a 100644
--- a/src/lib/dhcpsrv/parsers/shared_network_parser.cc
+++ b/src/lib/dhcpsrv/parsers/shared_network_parser.cc
@@ -7,8 +7,6 @@
 #ifndef SHARED_NETWORK_PARSER_H
 #define SHARED_NETWORK_PARSER_H
 
-#include <config.h>
-
 #include <cc/data.h>
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc
index 3180f94587..e766e96323 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser4.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <dhcpsrv/parsers/simple_parser4.h>
 #include <cc/data.h>
 #include <boost/foreach.hpp>
diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc
index 6384b8fb77..f7ca2dba16 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser6.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <cc/data.h>
 #include <dhcpsrv/parsers/simple_parser6.h>
 #include <boost/foreach.hpp>
diff --git a/src/lib/dhcpsrv/shared_network.cc b/src/lib/dhcpsrv/shared_network.cc
index 7dc60603b2..695a9cf5ff 100644
--- a/src/lib/dhcpsrv/shared_network.cc
+++ b/src/lib/dhcpsrv/shared_network.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/shared_network.h>
 
diff --git a/src/lib/dhcpsrv/testutils/host_data_source_utils.cc b/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
index 09239970e0..ad1f4f0e38 100644
--- a/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
+++ b/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <dhcpsrv/testutils/host_data_source_utils.h>
 #include <asiolink/io_address.h>
 #include <boost/foreach.hpp>
diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc
index 515ce74408..d5e871c95a 100644
--- a/src/lib/eval/lexer.cc
+++ b/src/lib/eval/lexer.cc
@@ -294,8 +294,6 @@
 
 /* begin standard C headers. */
 /* %if-c-only */
-#include <config.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index 639e76d223..7f6290134a 100644
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -45,8 +45,6 @@
 #  endif
 # endif
 
-#include <config.h>
-
 #include "parser.h"
 
 // User implementation prologue.
diff --git a/src/lib/hooks/tests/parking_lots_unittest.cc b/src/lib/hooks/tests/parking_lots_unittest.cc
index 93dd92e84b..99b62ca83f 100644
--- a/src/lib/hooks/tests/parking_lots_unittest.cc
+++ b/src/lib/hooks/tests/parking_lots_unittest.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <hooks/parking_lots.h>
 #include <gtest/gtest.h>
diff --git a/src/lib/http/client.cc b/src/lib/http/client.cc
index 58ba929ed3..5b0da858e2 100644
--- a/src/lib/http/client.cc
+++ b/src/lib/http/client.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <asiolink/interval_timer.h>
 #include <asiolink/tcp_socket.h>
diff --git a/src/lib/http/connection.cc b/src/lib/http/connection.cc
index 2075dc6fe3..c6f3f36caa 100644
--- a/src/lib/http/connection.cc
+++ b/src/lib/http/connection.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <http/connection.h>
 #include <http/connection_pool.h>
diff --git a/src/lib/http/connection_pool.cc b/src/lib/http/connection_pool.cc
index 770e193b55..8d39c02d4d 100644
--- a/src/lib/http/connection_pool.cc
+++ b/src/lib/http/connection_pool.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <http/connection_pool.h>
 
diff --git a/src/lib/http/date_time.cc b/src/lib/http/date_time.cc
index 4a24d86866..a18116704f 100644
--- a/src/lib/http/date_time.cc
+++ b/src/lib/http/date_time.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/date_time.h>
 #include <boost/date_time/time_facet.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
diff --git a/src/lib/http/http_header.cc b/src/lib/http/http_header.cc
index b5d6c79bb1..3e62cc14a8 100644
--- a/src/lib/http/http_header.cc
+++ b/src/lib/http/http_header.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <http/http_header.h>
 #include <util/strutil.h>
diff --git a/src/lib/http/http_log.cc b/src/lib/http/http_log.cc
index 72559121b3..64892f26f8 100644
--- a/src/lib/http/http_log.cc
+++ b/src/lib/http/http_log.cc
@@ -6,8 +6,6 @@
 
 /// Defines the logger used by the top-level component of kea-dhcp-ddns.
 
-#include <config.h>
-
 #include <http/http_log.h>
 
 namespace isc {
diff --git a/src/lib/http/http_message.cc b/src/lib/http/http_message.cc
index ce012cafae..0f7166dfed 100644
--- a/src/lib/http/http_message.cc
+++ b/src/lib/http/http_message.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/http_message.h>
 
 namespace isc {
diff --git a/src/lib/http/http_message_parser_base.cc b/src/lib/http/http_message_parser_base.cc
index 078cec6ea8..a5d84c660e 100644
--- a/src/lib/http/http_message_parser_base.cc
+++ b/src/lib/http/http_message_parser_base.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/http_message_parser_base.h>
 #include <boost/bind.hpp>
 
diff --git a/src/lib/http/listener.cc b/src/lib/http/listener.cc
index f123ddb88f..643376942f 100644
--- a/src/lib/http/listener.cc
+++ b/src/lib/http/listener.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <asiolink/tcp_endpoint.h>
 #include <http/connection.h>
diff --git a/src/lib/http/post_request.cc b/src/lib/http/post_request.cc
index e40c67f7c2..62e4a34a73 100644
--- a/src/lib/http/post_request.cc
+++ b/src/lib/http/post_request.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/post_request.h>
 
 namespace isc {
diff --git a/src/lib/http/post_request_json.cc b/src/lib/http/post_request_json.cc
index 163a6e7f0c..0c7d74f7dc 100644
--- a/src/lib/http/post_request_json.cc
+++ b/src/lib/http/post_request_json.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/post_request_json.h>
 
 using namespace isc::data;
diff --git a/src/lib/http/request.cc b/src/lib/http/request.cc
index 0d6529f58f..678f8b605d 100644
--- a/src/lib/http/request.cc
+++ b/src/lib/http/request.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/request.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/src/lib/http/request_parser.cc b/src/lib/http/request_parser.cc
index 5b1f5fb27c..fe9716646e 100644
--- a/src/lib/http/request_parser.cc
+++ b/src/lib/http/request_parser.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/request_parser.h>
 #include <boost/bind.hpp>
 #include <iostream>
diff --git a/src/lib/http/response.cc b/src/lib/http/response.cc
index b82e0dcfe5..13fd4a5b2c 100644
--- a/src/lib/http/response.cc
+++ b/src/lib/http/response.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/date_time.h>
 #include <http/response.h>
 #include <boost/date_time/local_time/local_time.hpp>
diff --git a/src/lib/http/response_creator.cc b/src/lib/http/response_creator.cc
index da74987ea7..8c63fea41b 100644
--- a/src/lib/http/response_creator.cc
+++ b/src/lib/http/response_creator.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/response_creator.h>
 
 namespace isc {
diff --git a/src/lib/http/response_json.cc b/src/lib/http/response_json.cc
index 3a8445d351..aa29d49b1f 100644
--- a/src/lib/http/response_json.cc
+++ b/src/lib/http/response_json.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/response_json.h>
 #include <map>
 
diff --git a/src/lib/http/response_parser.cc b/src/lib/http/response_parser.cc
index b412a5b02b..127d3a0418 100644
--- a/src/lib/http/response_parser.cc
+++ b/src/lib/http/response_parser.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <http/response_parser.h>
 #include <boost/bind.hpp>
 
diff --git a/src/lib/http/tests/run_unittests.cc b/src/lib/http/tests/run_unittests.cc
index ba4f4ff0ed..581febb976 100644
--- a/src/lib/http/tests/run_unittests.cc
+++ b/src/lib/http/tests/run_unittests.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <log/logger_support.h>
 #include <http/http_log.h>
 #include <gtest/gtest.h>
diff --git a/src/lib/http/url.cc b/src/lib/http/url.cc
index d7b161d28c..fe68f58e6a 100644
--- a/src/lib/http/url.cc
+++ b/src/lib/http/url.cc
@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <config.h>
-
 #include <exceptions/exceptions.h>
 #include <http/url.h>
 #include <boost/lexical_cast.hpp>