[5521] Used a different script that skips generated files

    Added config.h to non-generated cc files only

64 files changed, 128 insertions, 0 deletions

diff --git a/src/bin/agent/ca_command_mgr.cc b/src/bin/agent/ca_command_mgr.cc
index 85e998db61..db8231c573 100644
--- a/src/bin/agent/ca_command_mgr.cc
+++ b/src/bin/agent/ca_command_mgr.cc
@@ -4,6 +4,8 @@
 // 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 7c9147c8b3..6564a07735 100644
--- a/src/bin/agent/ca_log.cc
+++ b/src/bin/agent/ca_log.cc
@@ -4,6 +4,8 @@
 // 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 5eb85170a9..a6ccb525e6 100644
--- a/src/bin/agent/ca_response_creator.cc
+++ b/src/bin/agent/ca_response_creator.cc
@@ -4,6 +4,8 @@
 // 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 946ce71e17..2efcd5808b 100644
--- a/src/bin/agent/parser_context.cc
+++ b/src/bin/agent/parser_context.cc
@@ -4,6 +4,8 @@
 // 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 39d182f829..807b7c7d52 100644
--- a/src/bin/agent/simple_parser.cc
+++ b/src/bin/agent/simple_parser.cc
@@ -4,6 +4,8 @@
 // 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 44132a47a3..7b4ad44316 100644
--- a/src/bin/agent/tests/ca_unittests.cc
+++ b/src/bin/agent/tests/ca_unittests.cc
@@ -4,6 +4,8 @@
 // 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 c7d8fb7c3b..421c4e3e57 100644
--- a/src/bin/agent/tests/parser_unittests.cc
+++ b/src/bin/agent/tests/parser_unittests.cc
@@ -4,6 +4,8 @@
 // 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/parser_context.cc b/src/bin/d2/parser_context.cc
index 54a136bd6e..e38d0c47b9 100644
--- a/src/bin/d2/parser_context.cc
+++ b/src/bin/d2/parser_context.cc
@@ -4,6 +4,8 @@
 // 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 9ecd663451..2bb62543f6 100644
--- a/src/bin/d2/tests/parser_unittest.cc
+++ b/src/bin/d2/tests/parser_unittest.cc
@@ -3,6 +3,8 @@
 // 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/parser_context.cc b/src/bin/dhcp4/parser_context.cc
index d160a2f6c7..de28969fb6 100644
--- a/src/bin/dhcp4/parser_context.cc
+++ b/src/bin/dhcp4/parser_context.cc
@@ -4,6 +4,8 @@
 // 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 4adafb09a6..fdd1730fc1 100644
--- a/src/bin/dhcp4/tests/callout_library_3.cc
+++ b/src/bin/dhcp4/tests/callout_library_3.cc
@@ -9,6 +9,8 @@
 /// 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 b73cf22578..b9eefc3467 100644
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -4,6 +4,8 @@
 // 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/parser_context.cc b/src/bin/dhcp6/parser_context.cc
index 0ed107886f..f76df94ed3 100644
--- a/src/bin/dhcp6/parser_context.cc
+++ b/src/bin/dhcp6/parser_context.cc
@@ -4,6 +4,8 @@
 // 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 3305ac1ce6..b268aedde1 100644
--- a/src/bin/dhcp6/tests/callout_library_3.cc
+++ b/src/bin/dhcp6/tests/callout_library_3.cc
@@ -9,6 +9,8 @@
 /// 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 a83e4a1b1a..65a7e3591a 100644
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -4,6 +4,8 @@
 // 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 8c18da45e8..97912ce71e 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_callouts.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_callouts.cc
@@ -8,6 +8,8 @@
 // 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 8215a6effa..7622a9c89d 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_log.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds_log.cc
@@ -4,6 +4,8 @@
 // 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 535fc9803a..04b3252695 100644
--- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
@@ -4,6 +4,8 @@
 // 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 600d522379..4c87f80c8a 100644
--- a/src/hooks/dhcp/lease_cmds/tests/run_unittests.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/run_unittests.cc
@@ -4,6 +4,8 @@
 // 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 768ff05d00..be210486e5 100644
--- a/src/hooks/dhcp/stat_cmds/stat_cmds_callouts.cc
+++ b/src/hooks/dhcp/stat_cmds/stat_cmds_callouts.cc
@@ -8,6 +8,8 @@
 // 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 8b257da7b3..1b985a6640 100644
--- a/src/hooks/dhcp/stat_cmds/stat_cmds_log.cc
+++ b/src/hooks/dhcp/stat_cmds/stat_cmds_log.cc
@@ -4,6 +4,8 @@
 // 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 096485fb7a..f5014ce44f 100644
--- a/src/hooks/dhcp/stat_cmds/tests/run_unittests.cc
+++ b/src/hooks/dhcp/stat_cmds/tests/run_unittests.cc
@@ -4,6 +4,8 @@
 // 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 4e8a8a0489..46d1e54595 100644
--- a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
+++ b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
@@ -6,6 +6,8 @@
 //
 
 
+#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 c72b1270d7..02d30bb5e4 100644
--- a/src/lib/asiolink/testutils/test_server_unix_socket.cc
+++ b/src/lib/asiolink/testutils/test_server_unix_socket.cc
@@ -4,6 +4,8 @@
 // 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 af6f4cd9ba..d32684f067 100644
--- a/src/lib/asiolink/unix_domain_socket.cc
+++ b/src/lib/asiolink/unix_domain_socket.cc
@@ -4,6 +4,8 @@
 // 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 269d896c3a..3ea8040615 100644
--- a/src/lib/cc/json_feed.cc
+++ b/src/lib/cc/json_feed.cc
@@ -4,6 +4,8 @@
 // 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 a8defad781..38b5e1368d 100644
--- a/src/lib/cc/simple_parser.cc
+++ b/src/lib/cc/simple_parser.cc
@@ -4,6 +4,8 @@
 // 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 9febfe868e..ae2fc17633 100644
--- a/src/lib/cc/tests/simple_parser_unittest.cc
+++ b/src/lib/cc/tests/simple_parser_unittest.cc
@@ -4,6 +4,8 @@
 // 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 e4e2399198..74104006ef 100644
--- a/src/lib/cc/user_context.cc
+++ b/src/lib/cc/user_context.cc
@@ -4,6 +4,8 @@
 // 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 2bca336174..17d058a804 100644
--- a/src/lib/config/base_command_mgr.cc
+++ b/src/lib/config/base_command_mgr.cc
@@ -4,6 +4,8 @@
 // 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 2045d263e4..e140568443 100644
--- a/src/lib/config/client_connection.cc
+++ b/src/lib/config/client_connection.cc
@@ -4,6 +4,8 @@
 // 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 c7c2e3df2b..9238ed9975 100644
--- a/src/lib/config/hooked_command_mgr.cc
+++ b/src/lib/config/hooked_command_mgr.cc
@@ -4,6 +4,8 @@
 // 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 206298124f..9a6ee8a1b7 100644
--- a/src/lib/dhcpsrv/cfg_4o6.cc
+++ b/src/lib/dhcpsrv/cfg_4o6.cc
@@ -4,6 +4,8 @@
 // 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 5798bf51d2..d21a287815 100644
--- a/src/lib/dhcpsrv/cfg_hosts_util.cc
+++ b/src/lib/dhcpsrv/cfg_hosts_util.cc
@@ -4,6 +4,8 @@
 // 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 c41664524f..f2e3cd0a42 100644
--- a/src/lib/dhcpsrv/db_log.cc
+++ b/src/lib/dhcpsrv/db_log.cc
@@ -6,6 +6,8 @@
 
 /// 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 b39585edd6..013d8c469d 100644
--- a/src/lib/dhcpsrv/dhcpsrv_db_log.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_db_log.cc
@@ -6,6 +6,8 @@
 
 /// 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 fbd7d35539..4a1136bb0a 100644
--- a/src/lib/dhcpsrv/network.cc
+++ b/src/lib/dhcpsrv/network.cc
@@ -4,6 +4,8 @@
 // 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 fdf5d17f6c..a13cc609f3 100644
--- a/src/lib/dhcpsrv/network_state.cc
+++ b/src/lib/dhcpsrv/network_state.cc
@@ -4,6 +4,8 @@
 // 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 27fd9ab41f..9f4e138560 100644
--- a/src/lib/dhcpsrv/parsers/option_data_parser.cc
+++ b/src/lib/dhcpsrv/parsers/option_data_parser.cc
@@ -4,6 +4,8 @@
 // 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 693b0f271a..2e77490f9a 100644
--- a/src/lib/dhcpsrv/parsers/shared_network_parser.cc
+++ b/src/lib/dhcpsrv/parsers/shared_network_parser.cc
@@ -7,6 +7,8 @@
 #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 e766e96323..3180f94587 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser4.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc
@@ -4,6 +4,8 @@
 // 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 f7ca2dba16..6384b8fb77 100644
--- a/src/lib/dhcpsrv/parsers/simple_parser6.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc
@@ -4,6 +4,8 @@
 // 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 695a9cf5ff..7dc60603b2 100644
--- a/src/lib/dhcpsrv/shared_network.cc
+++ b/src/lib/dhcpsrv/shared_network.cc
@@ -4,6 +4,8 @@
 // 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 ad1f4f0e38..09239970e0 100644
--- a/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
+++ b/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
@@ -4,6 +4,8 @@
 // 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/hooks/tests/parking_lots_unittest.cc b/src/lib/hooks/tests/parking_lots_unittest.cc
index 99b62ca83f..93dd92e84b 100644
--- a/src/lib/hooks/tests/parking_lots_unittest.cc
+++ b/src/lib/hooks/tests/parking_lots_unittest.cc
@@ -4,6 +4,8 @@
 // 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 5b0da858e2..58ba929ed3 100644
--- a/src/lib/http/client.cc
+++ b/src/lib/http/client.cc
@@ -4,6 +4,8 @@
 // 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 c6f3f36caa..2075dc6fe3 100644
--- a/src/lib/http/connection.cc
+++ b/src/lib/http/connection.cc
@@ -4,6 +4,8 @@
 // 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 8d39c02d4d..770e193b55 100644
--- a/src/lib/http/connection_pool.cc
+++ b/src/lib/http/connection_pool.cc
@@ -4,6 +4,8 @@
 // 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 a18116704f..4a24d86866 100644
--- a/src/lib/http/date_time.cc
+++ b/src/lib/http/date_time.cc
@@ -4,6 +4,8 @@
 // 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 3e62cc14a8..b5d6c79bb1 100644
--- a/src/lib/http/http_header.cc
+++ b/src/lib/http/http_header.cc
@@ -4,6 +4,8 @@
 // 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 64892f26f8..72559121b3 100644
--- a/src/lib/http/http_log.cc
+++ b/src/lib/http/http_log.cc
@@ -6,6 +6,8 @@
 
 /// 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 0f7166dfed..ce012cafae 100644
--- a/src/lib/http/http_message.cc
+++ b/src/lib/http/http_message.cc
@@ -4,6 +4,8 @@
 // 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 a5d84c660e..078cec6ea8 100644
--- a/src/lib/http/http_message_parser_base.cc
+++ b/src/lib/http/http_message_parser_base.cc
@@ -4,6 +4,8 @@
 // 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 643376942f..f123ddb88f 100644
--- a/src/lib/http/listener.cc
+++ b/src/lib/http/listener.cc
@@ -4,6 +4,8 @@
 // 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 62e4a34a73..e40c67f7c2 100644
--- a/src/lib/http/post_request.cc
+++ b/src/lib/http/post_request.cc
@@ -4,6 +4,8 @@
 // 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 0c7d74f7dc..163a6e7f0c 100644
--- a/src/lib/http/post_request_json.cc
+++ b/src/lib/http/post_request_json.cc
@@ -4,6 +4,8 @@
 // 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 678f8b605d..0d6529f58f 100644
--- a/src/lib/http/request.cc
+++ b/src/lib/http/request.cc
@@ -4,6 +4,8 @@
 // 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 fe9716646e..5b1f5fb27c 100644
--- a/src/lib/http/request_parser.cc
+++ b/src/lib/http/request_parser.cc
@@ -4,6 +4,8 @@
 // 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 13fd4a5b2c..b82e0dcfe5 100644
--- a/src/lib/http/response.cc
+++ b/src/lib/http/response.cc
@@ -4,6 +4,8 @@
 // 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 8c63fea41b..da74987ea7 100644
--- a/src/lib/http/response_creator.cc
+++ b/src/lib/http/response_creator.cc
@@ -4,6 +4,8 @@
 // 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 aa29d49b1f..3a8445d351 100644
--- a/src/lib/http/response_json.cc
+++ b/src/lib/http/response_json.cc
@@ -4,6 +4,8 @@
 // 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 127d3a0418..b412a5b02b 100644
--- a/src/lib/http/response_parser.cc
+++ b/src/lib/http/response_parser.cc
@@ -4,6 +4,8 @@
 // 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 581febb976..ba4f4ff0ed 100644
--- a/src/lib/http/tests/run_unittests.cc
+++ b/src/lib/http/tests/run_unittests.cc
@@ -4,6 +4,8 @@
 // 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 fe68f58e6a..d7b161d28c 100644
--- a/src/lib/http/url.cc
+++ b/src/lib/http/url.cc
@@ -4,6 +4,8 @@
 // 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>