summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/d2/d2_log.cc2
-rw-r--r--src/bin/d2/d2_update_message.cc2
-rw-r--r--src/bin/d2/d2_zone.cc2
-rw-r--r--src/bin/d2/tests/d2_unittests.cc2
-rw-r--r--src/bin/dhcp4/dhcp4_log.cc2
-rw-r--r--src/bin/dhcp4/tests/callout_library_1.cc2
-rw-r--r--src/bin/dhcp4/tests/callout_library_2.cc2
-rw-r--r--src/bin/dhcp4/tests/dhcp4_unittests.cc2
-rw-r--r--src/bin/dhcp4/tests/marker_file.cc2
-rw-r--r--src/bin/dhcp6/dhcp6_log.cc2
-rw-r--r--src/bin/dhcp6/tests/callout_library_1.cc2
-rw-r--r--src/bin/dhcp6/tests/callout_library_2.cc2
-rw-r--r--src/bin/dhcp6/tests/dhcp6_unittests.cc2
-rw-r--r--src/bin/dhcp6/tests/marker_file.cc2
-rw-r--r--src/bin/lfc/lfc_log.cc2
-rw-r--r--src/bin/lfc/tests/lfc_controller_unittests.cc2
-rw-r--r--src/bin/lfc/tests/lfc_unittests.cc2
-rw-r--r--src/bin/perfdhcp/rate_control.cc2
-rw-r--r--src/bin/perfdhcp/tests/rate_control_unittest.cc2
-rw-r--r--src/bin/sockcreator/main.cc2
-rw-r--r--src/bin/sockcreator/sockcreator.cc2
-rw-r--r--src/bin/sockcreator/tests/run_unittests.cc2
-rw-r--r--src/hooks/dhcp/user_chk/tests/run_unittests.cc2
-rw-r--r--src/hooks/dhcp/user_chk/tests/user_file_unittests.cc2
-rw-r--r--src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc2
-rw-r--r--src/hooks/dhcp/user_chk/tests/user_unittests.cc2
-rw-r--r--src/hooks/dhcp/user_chk/tests/userid_unittests.cc2
-rw-r--r--src/hooks/dhcp/user_chk/user.cc2
-rw-r--r--src/hooks/dhcp/user_chk/user_chk_log.cc2
-rw-r--r--src/hooks/dhcp/user_chk/user_file.cc2
-rw-r--r--src/hooks/dhcp/user_chk/user_registry.cc2
-rw-r--r--src/lib/asiodns/logger.cc2
-rw-r--r--src/lib/asiodns/tests/run_unittests.cc2
-rw-r--r--src/lib/asiolink/tests/io_service_unittest.cc2
-rw-r--r--src/lib/asiolink/tests/run_unittests.cc2
-rw-r--r--src/lib/cc/tests/data_unittests.cc2
-rw-r--r--src/lib/cc/tests/run_unittests.cc2
-rw-r--r--src/lib/cfgrpt/cfgrpt.cc2
-rw-r--r--src/lib/cfgrpt/tests/run_unittests.cc2
-rw-r--r--src/lib/config/Makefile.am2
-rw-r--r--src/lib/config/command_mgr.cc2
-rw-r--r--src/lib/config/config_data.cc2
-rw-r--r--src/lib/config/config_log.cc2
-rw-r--r--src/lib/config/module_spec.cc2
-rw-r--r--src/lib/config/tests/command_mgr_unittests.cc2
-rw-r--r--src/lib/config/tests/config_data_unittests.cc2
-rw-r--r--src/lib/config/tests/module_spec_unittests.cc2
-rw-r--r--src/lib/config/tests/run_unittests.cc2
-rw-r--r--src/lib/cryptolink/botan_hash.cc2
-rw-r--r--src/lib/cryptolink/botan_hmac.cc2
-rw-r--r--src/lib/cryptolink/botan_link.cc2
-rw-r--r--src/lib/cryptolink/crypto_hash.cc2
-rw-r--r--src/lib/cryptolink/crypto_hmac.cc2
-rw-r--r--src/lib/cryptolink/cryptolink.cc2
-rw-r--r--src/lib/cryptolink/openssl_hash.cc2
-rw-r--r--src/lib/cryptolink/openssl_hmac.cc2
-rw-r--r--src/lib/cryptolink/openssl_link.cc2
-rw-r--r--src/lib/cryptolink/tests/run_unittests.cc2
-rw-r--r--src/lib/dhcp/duid.cc2
-rw-r--r--src/lib/dhcp/duid_factory.cc2
-rw-r--r--src/lib/dhcp/hwaddr.cc2
-rw-r--r--src/lib/dhcp/opaque_data_tuple.cc2
-rw-r--r--src/lib/dhcp/option4_addrlst.cc2
-rw-r--r--src/lib/dhcp/option4_client_fqdn.cc2
-rw-r--r--src/lib/dhcp/option6_client_fqdn.cc2
-rw-r--r--src/lib/dhcp/option_data_types.cc2
-rw-r--r--src/lib/dhcp/option_opaque_data_tuples.cc2
-rw-r--r--src/lib/dhcp/option_space.cc2
-rw-r--r--src/lib/dhcp/option_string.cc2
-rw-r--r--src/lib/dhcp/option_vendor_class.cc2
-rw-r--r--src/lib/dhcp/tests/run_unittests.cc2
-rw-r--r--src/lib/dhcp_ddns/dhcp_ddns_log.cc2
-rw-r--r--src/lib/dhcp_ddns/ncr_msg.cc2
-rw-r--r--src/lib/dhcp_ddns/tests/ncr_unittests.cc2
-rw-r--r--src/lib/dhcp_ddns/tests/run_unittests.cc2
-rw-r--r--src/lib/dhcp_ddns/tests/test_utils.cc2
-rw-r--r--src/lib/dhcpsrv/addr_utilities.cc2
-rw-r--r--src/lib/dhcpsrv/alloc_engine_log.cc2
-rw-r--r--src/lib/dhcpsrv/cfg_duid.cc2
-rw-r--r--src/lib/dhcpsrv/cfg_expiration.cc2
-rw-r--r--src/lib/dhcpsrv/cfg_host_operations.cc2
-rw-r--r--src/lib/dhcpsrv/cfg_option.cc2
-rw-r--r--src/lib/dhcpsrv/cfg_rsoo.cc2
-rw-r--r--src/lib/dhcpsrv/client_class_def.cc3
-rw-r--r--src/lib/dhcpsrv/cql_connection.cc2
-rw-r--r--src/lib/dhcpsrv/database_connection.cc2
-rw-r--r--src/lib/dhcpsrv/dhcpsrv_log.cc2
-rw-r--r--src/lib/dhcpsrv/host_data_source_factory.cc2
-rw-r--r--src/lib/dhcpsrv/hosts_log.cc2
-rw-r--r--src/lib/dhcpsrv/lease.cc2
-rw-r--r--src/lib/dhcpsrv/mysql_connection.cc2
-rw-r--r--src/lib/dhcpsrv/ncr_generator.cc2
-rw-r--r--src/lib/dhcpsrv/parsers/client_class_def_parser.cc2
-rw-r--r--src/lib/dhcpsrv/parsers/expiration_config_parser.cc2
-rw-r--r--src/lib/dhcpsrv/pgsql_exchange.cc2
-rw-r--r--src/lib/dhcpsrv/pool.cc2
-rw-r--r--src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/tests/lease_file_io.cc2
-rw-r--r--src/lib/dhcpsrv/testutils/config_result_check.cc2
-rw-r--r--src/lib/dns/benchmarks/message_renderer_bench.cc2
-rw-r--r--src/lib/dns/benchmarks/oldmessagerenderer.cc2
-rw-r--r--src/lib/dns/benchmarks/rdatarender_bench.cc2
-rw-r--r--src/lib/dns/exceptions.cc2
-rw-r--r--src/lib/dns/master_lexer.cc2
-rw-r--r--src/lib/dns/master_lexer_inputsource.cc2
-rw-r--r--src/lib/dns/master_loader_callbacks.cc2
-rw-r--r--src/lib/dns/masterload.cc2
-rw-r--r--src/lib/dns/message.cc2
-rw-r--r--src/lib/dns/messagerenderer.cc2
-rw-r--r--src/lib/dns/name.cc2
-rw-r--r--src/lib/dns/nsec3hash.cc2
-rw-r--r--src/lib/dns/opcode.cc2
-rw-r--r--src/lib/dns/question.cc2
-rw-r--r--src/lib/dns/rcode.cc2
-rw-r--r--src/lib/dns/rdata/ch_3/a_1.cc2
-rw-r--r--src/lib/dns/rdata/generic/afsdb_18.cc2
-rw-r--r--src/lib/dns/rdata/generic/detail/char_string.cc2
-rw-r--r--src/lib/dns/rdata/generic/detail/nsec3param_common.cc2
-rw-r--r--src/lib/dns/rdata/generic/detail/nsec_bitmap.cc2
-rw-r--r--src/lib/dns/rdata/generic/dlv_32769.cc2
-rw-r--r--src/lib/dns/rdata/generic/ds_43.cc2
-rw-r--r--src/lib/dns/rdata/generic/minfo_14.cc2
-rw-r--r--src/lib/dns/rdata/generic/nsec_47.cc2
-rw-r--r--src/lib/dns/rdata/generic/rp_17.cc2
-rw-r--r--src/lib/dns/rdata/generic/spf_99.cc2
-rw-r--r--src/lib/dns/rdata/generic/txt_16.cc2
-rw-r--r--src/lib/dns/rdata/hs_4/a_1.cc2
-rw-r--r--src/lib/dns/rdata/in_1/a_1.cc2
-rw-r--r--src/lib/dns/rdata/in_1/aaaa_28.cc2
-rw-r--r--src/lib/dns/rdata/in_1/dhcid_49.cc2
-rw-r--r--src/lib/dns/rdata/in_1/srv_33.cc2
-rw-r--r--src/lib/dns/rdata/template.cc2
-rw-r--r--src/lib/dns/rdatafields.cc2
-rw-r--r--src/lib/dns/rrclass.cc2
-rw-r--r--src/lib/dns/rrcollator.cc2
-rw-r--r--src/lib/dns/rrparamregistry-placeholder.cc2
-rw-r--r--src/lib/dns/rrparamregistry.cc2
-rw-r--r--src/lib/dns/rrset.cc2
-rw-r--r--src/lib/dns/rrset_collection.cc2
-rw-r--r--src/lib/dns/rrttl.cc2
-rw-r--r--src/lib/dns/rrtype.cc2
-rw-r--r--src/lib/dns/serial.cc2
-rw-r--r--src/lib/dns/tests/dns_exceptions_unittest.cc2
-rw-r--r--src/lib/dns/tests/edns_unittest.cc2
-rw-r--r--src/lib/dns/tests/master_lexer_inputsource_unittest.cc2
-rw-r--r--src/lib/dns/tests/master_lexer_state_unittest.cc2
-rw-r--r--src/lib/dns/tests/master_lexer_token_unittest.cc2
-rw-r--r--src/lib/dns/tests/master_lexer_unittest.cc2
-rw-r--r--src/lib/dns/tests/master_loader_callbacks_test.cc2
-rw-r--r--src/lib/dns/tests/master_loader_unittest.cc2
-rw-r--r--src/lib/dns/tests/masterload_unittest.cc2
-rw-r--r--src/lib/dns/tests/message_unittest.cc2
-rw-r--r--src/lib/dns/tests/messagerenderer_unittest.cc2
-rw-r--r--src/lib/dns/tests/name_unittest.cc2
-rw-r--r--src/lib/dns/tests/nsec3hash_unittest.cc2
-rw-r--r--src/lib/dns/tests/opcode_unittest.cc2
-rw-r--r--src/lib/dns/tests/question_unittest.cc2
-rw-r--r--src/lib/dns/tests/rcode_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_afsdb_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_caa_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_char_string_data_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_char_string_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_cname_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_dhcid_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_dname_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_dnskey_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_ds_like_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_hinfo_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_in_a_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_in_aaaa_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_minfo_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_mx_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_naptr_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_ns_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_nsec3_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_nsec3param_like_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_nsec3param_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_nsec_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_nsecbitmap_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_opt_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_pimpl_holder_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_ptr_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_rp_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_rrsig_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_soa_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_srv_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_sshfp_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_tlsa_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_tsig_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_txt_like_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdata_unittest.cc2
-rw-r--r--src/lib/dns/tests/rdatafields_unittest.cc2
-rw-r--r--src/lib/dns/tests/rrclass_unittest.cc2
-rw-r--r--src/lib/dns/tests/rrcollator_unittest.cc2
-rw-r--r--src/lib/dns/tests/rrparamregistry_unittest.cc2
-rw-r--r--src/lib/dns/tests/rrset_collection_unittest.cc2
-rw-r--r--src/lib/dns/tests/rrset_unittest.cc2
-rw-r--r--src/lib/dns/tests/rrttl_unittest.cc2
-rw-r--r--src/lib/dns/tests/rrtype_unittest.cc2
-rw-r--r--src/lib/dns/tests/run_unittests.cc2
-rw-r--r--src/lib/dns/tests/serial_unittest.cc2
-rw-r--r--src/lib/dns/tests/tsig_unittest.cc2
-rw-r--r--src/lib/dns/tests/tsigerror_unittest.cc2
-rw-r--r--src/lib/dns/tests/tsigkey_unittest.cc2
-rw-r--r--src/lib/dns/tests/tsigrecord_unittest.cc2
-rw-r--r--src/lib/dns/tests/zone_checker_unittest.cc2
-rw-r--r--src/lib/dns/tsig.cc2
-rw-r--r--src/lib/dns/tsigerror.cc2
-rw-r--r--src/lib/dns/tsigkey.cc2
-rw-r--r--src/lib/dns/tsigrecord.cc2
-rw-r--r--src/lib/dns/zone_checker.cc2
-rw-r--r--src/lib/eval/eval_context.cc2
-rw-r--r--src/lib/eval/eval_log.cc2
-rw-r--r--src/lib/eval/evaluate.cc2
-rw-r--r--src/lib/eval/lexer.cc2
-rw-r--r--src/lib/eval/parser.cc2
-rw-r--r--src/lib/eval/tests/run_unittests.cc2
-rw-r--r--src/lib/eval/token.cc2
-rw-r--r--src/lib/exceptions/exceptions.cc2
-rw-r--r--src/lib/exceptions/tests/exceptions_unittest.cc2
-rw-r--r--src/lib/exceptions/tests/run_unittests.cc2
-rw-r--r--src/lib/hooks/callout_handle.cc2
-rw-r--r--src/lib/hooks/hooks_log.cc2
-rw-r--r--src/lib/hooks/hooks_manager.cc2
-rw-r--r--src/lib/hooks/libinfo.cc2
-rw-r--r--src/lib/hooks/library_handle.cc2
-rw-r--r--src/lib/hooks/library_manager_collection.cc2
-rw-r--r--src/lib/hooks/server_hooks.cc2
-rw-r--r--src/lib/hooks/tests/callout_handle_unittest.cc2
-rw-r--r--src/lib/hooks/tests/callout_manager_unittest.cc2
-rw-r--r--src/lib/hooks/tests/handles_unittest.cc2
-rw-r--r--src/lib/hooks/tests/hooks_manager_unittest.cc2
-rw-r--r--src/lib/hooks/tests/library_manager_collection_unittest.cc2
-rw-r--r--src/lib/hooks/tests/library_manager_unittest.cc2
-rw-r--r--src/lib/hooks/tests/run_unittests.cc2
-rw-r--r--src/lib/hooks/tests/server_hooks_unittest.cc2
-rw-r--r--src/lib/log/Makefile.am2
-rw-r--r--src/lib/log/buffer_appender_impl.cc2
-rw-r--r--src/lib/log/compiler/message.cc4
-rw-r--r--src/lib/log/interprocess/interprocess_sync_file.cc2
-rw-r--r--src/lib/log/interprocess/interprocess_sync_null.cc2
-rw-r--r--src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc2
-rw-r--r--src/lib/log/interprocess/tests/run_unittests.cc2
-rw-r--r--src/lib/log/log_messages.cc2
-rw-r--r--src/lib/log/logger.cc2
-rw-r--r--src/lib/log/logger_impl.cc2
-rw-r--r--src/lib/log/logger_level.cc2
-rw-r--r--src/lib/log/logger_level_impl.cc2
-rw-r--r--src/lib/log/logger_manager.cc2
-rw-r--r--src/lib/log/logger_name.cc2
-rw-r--r--src/lib/log/logger_support.cc2
-rw-r--r--src/lib/log/logger_unittest_support.cc2
-rw-r--r--src/lib/log/logimpl_messages.cc2
-rw-r--r--src/lib/log/message_dictionary.cc2
-rw-r--r--src/lib/log/message_initializer.cc2
-rw-r--r--src/lib/log/message_reader.cc2
-rw-r--r--src/lib/log/output_option.cc2
-rw-r--r--src/lib/log/tests/buffer_logger_test.cc2
-rw-r--r--src/lib/log/tests/init_logger_test.cc2
-rw-r--r--src/lib/log/tests/logger_example.cc2
-rw-r--r--src/lib/log/tests/logger_level_impl_unittest.cc2
-rw-r--r--src/lib/log/tests/logger_level_unittest.cc2
-rw-r--r--src/lib/log/tests/logger_lock_test.cc2
-rw-r--r--src/lib/log/tests/logger_manager_unittest.cc2
-rw-r--r--src/lib/log/tests/logger_name_unittest.cc2
-rw-r--r--src/lib/log/tests/logger_specification_unittest.cc2
-rw-r--r--src/lib/log/tests/logger_support_unittest.cc2
-rw-r--r--src/lib/log/tests/message_dictionary_unittest.cc2
-rw-r--r--src/lib/log/tests/message_initializer_1_unittest.cc2
-rw-r--r--src/lib/log/tests/message_initializer_1a_unittest.cc2
-rw-r--r--src/lib/log/tests/message_reader_unittest.cc2
-rw-r--r--src/lib/log/tests/output_option_unittest.cc2
-rw-r--r--src/lib/log/tests/run_initializer_unittests.cc2
-rw-r--r--src/lib/log/tests/run_unittests.cc2
-rw-r--r--src/lib/process/d_log.cc2
-rw-r--r--src/lib/process/io_service_signal.cc2
-rw-r--r--src/lib/process/tests/run_unittests.cc2
-rw-r--r--src/lib/stats/context.cc2
-rw-r--r--src/lib/stats/observation.cc2
-rw-r--r--src/lib/stats/stats_mgr.cc2
-rw-r--r--src/lib/stats/tests/run_unittests.cc2
-rw-r--r--src/lib/testutils/io_utils.cc2
-rw-r--r--src/lib/testutils/log_utils.cc2
-rw-r--r--src/lib/testutils/unix_control_client.cc2
-rw-r--r--src/lib/util/boost_time_utils.cc2
-rw-r--r--src/lib/util/csv_file.cc2
-rw-r--r--src/lib/util/encode/base_n.cc2
-rw-r--r--src/lib/util/filename.cc2
-rw-r--r--src/lib/util/io/fd.cc2
-rw-r--r--src/lib/util/io/fd_share.cc2
-rw-r--r--src/lib/util/labeled_value.cc2
-rw-r--r--src/lib/util/memory_segment_local.cc2
-rw-r--r--src/lib/util/pid_file.cc2
-rw-r--r--src/lib/util/process_spawn.cc2
-rw-r--r--src/lib/util/random/qid_gen.cc2
-rw-r--r--src/lib/util/signal_set.cc2
-rw-r--r--src/lib/util/stopwatch.cc2
-rw-r--r--src/lib/util/stopwatch_impl.cc2
-rw-r--r--src/lib/util/strutil.cc2
-rw-r--r--src/lib/util/tests/base32hex_unittest.cc2
-rw-r--r--src/lib/util/tests/base64_unittest.cc2
-rw-r--r--src/lib/util/tests/filename_unittest.cc2
-rw-r--r--src/lib/util/tests/hex_unittest.cc2
-rw-r--r--src/lib/util/tests/io_utilities_unittest.cc2
-rw-r--r--src/lib/util/tests/labeled_value_unittest.cc2
-rw-r--r--src/lib/util/tests/memory_segment_common_unittest.cc2
-rw-r--r--src/lib/util/tests/memory_segment_local_unittest.cc2
-rw-r--r--src/lib/util/tests/pid_file_unittest.cc2
-rw-r--r--src/lib/util/tests/process_spawn_unittest.cc2
-rw-r--r--src/lib/util/tests/qid_gen_unittest.cc2
-rw-r--r--src/lib/util/tests/run_unittests.cc2
-rw-r--r--src/lib/util/tests/signal_set_unittest.cc2
-rw-r--r--src/lib/util/tests/stopwatch_unittest.cc2
-rw-r--r--src/lib/util/tests/strutil_unittest.cc2
-rw-r--r--src/lib/util/tests/time_utilities_unittest.cc2
-rw-r--r--src/lib/util/threads/tests/run_unittests.cc2
-rw-r--r--src/lib/util/time_utilities.cc2
-rw-r--r--src/lib/util/unittests/fork.cc2
-rw-r--r--src/lib/util/unittests/interprocess_util.cc2
-rw-r--r--src/lib/util/unittests/newhook.cc2
-rw-r--r--src/lib/util/unittests/resource.cc2
-rw-r--r--src/lib/util/unittests/run_all.cc2
-rw-r--r--src/lib/util/unittests/testdata.cc2
-rw-r--r--src/lib/util/unittests/wiredata.cc2
-rw-r--r--src/lib/util/versioned_csv_file.cc2
-rw-r--r--src/lib/util/watch_socket.cc2
326 files changed, 652 insertions, 3 deletions
diff --git a/src/bin/d2/d2_log.cc b/src/bin/d2/d2_log.cc
index 1b292a7b61..643e819a17 100644
--- a/src/bin/d2/d2_log.cc
+++ b/src/bin/d2/d2_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the top-level component of kea-dhcp-ddns.
+#include <config.h>
+
#include <d2/d2_log.h>
namespace isc {
diff --git a/src/bin/d2/d2_update_message.cc b/src/bin/d2/d2_update_message.cc
index a0076f29dd..7eb5ab813a 100644
--- a/src/bin/d2/d2_update_message.cc
+++ b/src/bin/d2/d2_update_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 <d2/d2_update_message.h>
#include <dns/messagerenderer.h>
#include <dns/name.h>
diff --git a/src/bin/d2/d2_zone.cc b/src/bin/d2/d2_zone.cc
index 60f2000546..e029d17d01 100644
--- a/src/bin/d2/d2_zone.cc
+++ b/src/bin/d2/d2_zone.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_zone.h>
namespace isc {
diff --git a/src/bin/d2/tests/d2_unittests.cc b/src/bin/d2/tests/d2_unittests.cc
index cc0c6448a3..adf63af5f9 100644
--- a/src/bin/d2/tests/d2_unittests.cc
+++ b/src/bin/d2/tests/d2_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 <d2/d2_log.h>
#include <gtest/gtest.h>
diff --git a/src/bin/dhcp4/dhcp4_log.cc b/src/bin/dhcp4/dhcp4_log.cc
index a62f7c7e32..4f82a1b3a9 100644
--- a/src/bin/dhcp4/dhcp4_log.cc
+++ b/src/bin/dhcp4/dhcp4_log.cc
@@ -7,6 +7,8 @@
/// @file dhcp4_log.cc
/// Contains the loggers used by the DHCPv4 server component.
+#include <config.h>
+
#include <dhcp4/dhcp4_log.h>
namespace isc {
diff --git a/src/bin/dhcp4/tests/callout_library_1.cc b/src/bin/dhcp4/tests/callout_library_1.cc
index 72045f28d0..866652c6f6 100644
--- a/src/bin/dhcp4/tests/callout_library_1.cc
+++ b/src/bin/dhcp4/tests/callout_library_1.cc
@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 1;
+#include <config.h>
+
#include "callout_library_common.h"
diff --git a/src/bin/dhcp4/tests/callout_library_2.cc b/src/bin/dhcp4/tests/callout_library_2.cc
index 3c7bbe00ff..ae417a2969 100644
--- a/src/bin/dhcp4/tests/callout_library_2.cc
+++ b/src/bin/dhcp4/tests/callout_library_2.cc
@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 2;
+#include <config.h>
+
#include "callout_library_common.h"
diff --git a/src/bin/dhcp4/tests/dhcp4_unittests.cc b/src/bin/dhcp4/tests/dhcp4_unittests.cc
index cc3dfb5389..3a7d4ec2a3 100644
--- a/src/bin/dhcp4/tests/dhcp4_unittests.cc
+++ b/src/bin/dhcp4/tests/dhcp4_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 <dhcp4/dhcp4_log.h>
#include <gtest/gtest.h>
diff --git a/src/bin/dhcp4/tests/marker_file.cc b/src/bin/dhcp4/tests/marker_file.cc
index 090a6e8430..066e1f763c 100644
--- a/src/bin/dhcp4/tests/marker_file.cc
+++ b/src/bin/dhcp4/tests/marker_file.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 "marker_file.h"
#include <gtest/gtest.h>
diff --git a/src/bin/dhcp6/dhcp6_log.cc b/src/bin/dhcp6/dhcp6_log.cc
index 9b65fd4f20..98e319457e 100644
--- a/src/bin/dhcp6/dhcp6_log.cc
+++ b/src/bin/dhcp6/dhcp6_log.cc
@@ -7,6 +7,8 @@
/// @file dhcp6_log.cc
/// Contains the loggers used by the DHCPv6 server component.
+#include <config.h>
+
#include <dhcp6/dhcp6_log.h>
namespace isc {
diff --git a/src/bin/dhcp6/tests/callout_library_1.cc b/src/bin/dhcp6/tests/callout_library_1.cc
index 72045f28d0..866652c6f6 100644
--- a/src/bin/dhcp6/tests/callout_library_1.cc
+++ b/src/bin/dhcp6/tests/callout_library_1.cc
@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 1;
+#include <config.h>
+
#include "callout_library_common.h"
diff --git a/src/bin/dhcp6/tests/callout_library_2.cc b/src/bin/dhcp6/tests/callout_library_2.cc
index 3c7bbe00ff..ae417a2969 100644
--- a/src/bin/dhcp6/tests/callout_library_2.cc
+++ b/src/bin/dhcp6/tests/callout_library_2.cc
@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 2;
+#include <config.h>
+
#include "callout_library_common.h"
diff --git a/src/bin/dhcp6/tests/dhcp6_unittests.cc b/src/bin/dhcp6/tests/dhcp6_unittests.cc
index 5cc826cf83..a98f513ba1 100644
--- a/src/bin/dhcp6/tests/dhcp6_unittests.cc
+++ b/src/bin/dhcp6/tests/dhcp6_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/dhcp6/tests/marker_file.cc b/src/bin/dhcp6/tests/marker_file.cc
index 090a6e8430..066e1f763c 100644
--- a/src/bin/dhcp6/tests/marker_file.cc
+++ b/src/bin/dhcp6/tests/marker_file.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 "marker_file.h"
#include <gtest/gtest.h>
diff --git a/src/bin/lfc/lfc_log.cc b/src/bin/lfc/lfc_log.cc
index 91e7765465..1a21b357e1 100644
--- a/src/bin/lfc/lfc_log.cc
+++ b/src/bin/lfc/lfc_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the top-level component of kea-lfc.
+#include <config.h>
+
#include <lfc/lfc_log.h>
namespace isc {
diff --git a/src/bin/lfc/tests/lfc_controller_unittests.cc b/src/bin/lfc/tests/lfc_controller_unittests.cc
index 6a3124eace..c0d9e7d29e 100644
--- a/src/bin/lfc/tests/lfc_controller_unittests.cc
+++ b/src/bin/lfc/tests/lfc_controller_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 <lfc/lfc_controller.h>
#include <util/csv_file.h>
#include <gtest/gtest.h>
diff --git a/src/bin/lfc/tests/lfc_unittests.cc b/src/bin/lfc/tests/lfc_unittests.cc
index da8a4fcc22..02cb292d08 100644
--- a/src/bin/lfc/tests/lfc_unittests.cc
+++ b/src/bin/lfc/tests/lfc_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/perfdhcp/rate_control.cc b/src/bin/perfdhcp/rate_control.cc
index 8eb59863fb..e6611287bd 100644
--- a/src/bin/perfdhcp/rate_control.cc
+++ b/src/bin/perfdhcp/rate_control.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 "rate_control.h"
diff --git a/src/bin/perfdhcp/tests/rate_control_unittest.cc b/src/bin/perfdhcp/tests/rate_control_unittest.cc
index ef478c3db7..64bfe2185e 100644
--- a/src/bin/perfdhcp/tests/rate_control_unittest.cc
+++ b/src/bin/perfdhcp/tests/rate_control_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 "rate_control.h"
#include <gtest/gtest.h>
diff --git a/src/bin/sockcreator/main.cc b/src/bin/sockcreator/main.cc
index d390c5bcd7..e47c1b2018 100644
--- a/src/bin/sockcreator/main.cc
+++ b/src/bin/sockcreator/main.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 "sockcreator.h"
#include <unistd.h>
diff --git a/src/bin/sockcreator/sockcreator.cc b/src/bin/sockcreator/sockcreator.cc
index 9ec6dc2bf4..62fb6f3d1c 100644
--- a/src/bin/sockcreator/sockcreator.cc
+++ b/src/bin/sockcreator/sockcreator.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 "sockcreator.h"
#include <util/io/fd.h>
diff --git a/src/bin/sockcreator/tests/run_unittests.cc b/src/bin/sockcreator/tests/run_unittests.cc
index e34b995302..035ba2a7ec 100644
--- a/src/bin/sockcreator/tests/run_unittests.cc
+++ b/src/bin/sockcreator/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
diff --git a/src/hooks/dhcp/user_chk/tests/run_unittests.cc b/src/hooks/dhcp/user_chk/tests/run_unittests.cc
index 06acda3984..83d8a9fa8e 100644
--- a/src/hooks/dhcp/user_chk/tests/run_unittests.cc
+++ b/src/hooks/dhcp/user_chk/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/user_chk/tests/user_file_unittests.cc b/src/hooks/dhcp/user_chk/tests/user_file_unittests.cc
index da8e0c8d30..4f8922b2fb 100644
--- a/src/hooks/dhcp/user_chk/tests/user_file_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/user_file_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 <exceptions/exceptions.h>
#include <test_data_files_config.h>
#include <user_file.h>
diff --git a/src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc b/src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc
index c2660ab6d4..b624691d6a 100644
--- a/src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/user_registry_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 <dhcp/hwaddr.h>
#include <exceptions/exceptions.h>
#include <user_registry.h>
diff --git a/src/hooks/dhcp/user_chk/tests/user_unittests.cc b/src/hooks/dhcp/user_chk/tests/user_unittests.cc
index 84d090b48f..3672bed9cc 100644
--- a/src/hooks/dhcp/user_chk/tests/user_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/user_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 <exceptions/exceptions.h>
#include <user.h>
diff --git a/src/hooks/dhcp/user_chk/tests/userid_unittests.cc b/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
index 27b8b85cc5..7d3a9dc0f1 100644
--- a/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/userid_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 <exceptions/exceptions.h>
#include <user.h>
diff --git a/src/hooks/dhcp/user_chk/user.cc b/src/hooks/dhcp/user_chk/user.cc
index 64f99fc0f1..531a486d23 100644
--- a/src/hooks/dhcp/user_chk/user.cc
+++ b/src/hooks/dhcp/user_chk/user.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/hwaddr.h>
#include <dhcp/duid.h>
#include <exceptions/exceptions.h>
diff --git a/src/hooks/dhcp/user_chk/user_chk_log.cc b/src/hooks/dhcp/user_chk/user_chk_log.cc
index 2fa0d215b9..f9261aa1b3 100644
--- a/src/hooks/dhcp/user_chk/user_chk_log.cc
+++ b/src/hooks/dhcp/user_chk/user_chk_log.cc
@@ -5,6 +5,8 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
/// Defines the logger used by the user check hooks library.
+#include <config.h>
+
#include <user_chk_log.h>
namespace user_chk {
diff --git a/src/hooks/dhcp/user_chk/user_file.cc b/src/hooks/dhcp/user_chk/user_file.cc
index d5e0979d4c..1586cf5e11 100644
--- a/src/hooks/dhcp/user_chk/user_file.cc
+++ b/src/hooks/dhcp/user_chk/user_file.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 <user.h>
#include <user_file.h>
diff --git a/src/hooks/dhcp/user_chk/user_registry.cc b/src/hooks/dhcp/user_chk/user_registry.cc
index c232253b71..b0d3f3f641 100644
--- a/src/hooks/dhcp/user_chk/user_registry.cc
+++ b/src/hooks/dhcp/user_chk/user_registry.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 <user_registry.h>
#include <user.h>
diff --git a/src/lib/asiodns/logger.cc b/src/lib/asiodns/logger.cc
index 3f6d5d5b30..b14701c3c3 100644
--- a/src/lib/asiodns/logger.cc
+++ b/src/lib/asiodns/logger.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 <asiodns/logger.h>
namespace isc {
diff --git a/src/lib/asiodns/tests/run_unittests.cc b/src/lib/asiodns/tests/run_unittests.cc
index 784fa599ba..5d71cc9b74 100644
--- a/src/lib/asiodns/tests/run_unittests.cc
+++ b/src/lib/asiodns/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
diff --git a/src/lib/asiolink/tests/io_service_unittest.cc b/src/lib/asiolink/tests/io_service_unittest.cc
index 70887c3d24..b1c33956be 100644
--- a/src/lib/asiolink/tests/io_service_unittest.cc
+++ b/src/lib/asiolink/tests/io_service_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 <asiolink/io_service.h>
#include <gtest/gtest.h>
diff --git a/src/lib/asiolink/tests/run_unittests.cc b/src/lib/asiolink/tests/run_unittests.cc
index 7044863677..395dcd1d6e 100644
--- a/src/lib/asiolink/tests/run_unittests.cc
+++ b/src/lib/asiolink/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
#include <log/logger_manager.h>
diff --git a/src/lib/cc/tests/data_unittests.cc b/src/lib/cc/tests/data_unittests.cc
index e1455ec56f..4031356db6 100644
--- a/src/lib/cc/tests/data_unittests.cc
+++ b/src/lib/cc/tests/data_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 <boost/foreach.hpp>
#include <boost/pointer_cast.hpp>
diff --git a/src/lib/cc/tests/run_unittests.cc b/src/lib/cc/tests/run_unittests.cc
index 0b4b59721b..40c051fba2 100644
--- a/src/lib/cc/tests/run_unittests.cc
+++ b/src/lib/cc/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
#include <log/logger_support.h>
diff --git a/src/lib/cfgrpt/cfgrpt.cc b/src/lib/cfgrpt/cfgrpt.cc
index facd80c606..747a5da305 100644
--- a/src/lib/cfgrpt/cfgrpt.cc
+++ b/src/lib/cfgrpt/cfgrpt.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 <sstream>
#include <cfgrpt/config_report.h>
diff --git a/src/lib/cfgrpt/tests/run_unittests.cc b/src/lib/cfgrpt/tests/run_unittests.cc
index 2f54b37ce2..9d621ae1fa 100644
--- a/src/lib/cfgrpt/tests/run_unittests.cc
+++ b/src/lib/cfgrpt/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 <gtest/gtest.h>
int
diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am
index c1487d59f7..b5d01e69a4 100644
--- a/src/lib/config/Makefile.am
+++ b/src/lib/config/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
# Define rule to build logging source files from message file
config_messages.h config_messages.cc: s-messages
diff --git a/src/lib/config/command_mgr.cc b/src/lib/config/command_mgr.cc
index bd1c04b1cb..88b3dd801f 100644
--- a/src/lib/config/command_mgr.cc
+++ b/src/lib/config/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 <asiolink/asio_wrapper.h>
#include <asiolink/interval_timer.h>
#include <asiolink/io_service.h>
diff --git a/src/lib/config/config_data.cc b/src/lib/config/config_data.cc
index 82537bc96a..cabd59470b 100644
--- a/src/lib/config/config_data.cc
+++ b/src/lib/config/config_data.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 <config/config_data.h>
#include <boost/foreach.hpp>
diff --git a/src/lib/config/config_log.cc b/src/lib/config/config_log.cc
index 40c9918351..b1ad13df15 100644
--- a/src/lib/config/config_log.cc
+++ b/src/lib/config/config_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the config lib
+#include <config.h>
+
#include "config/config_log.h"
namespace isc {
diff --git a/src/lib/config/module_spec.cc b/src/lib/config/module_spec.cc
index 0c9613b2b4..30692e12c9 100644
--- a/src/lib/config/module_spec.cc
+++ b/src/lib/config/module_spec.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 <config/module_spec.h>
#include <sstream>
diff --git a/src/lib/config/tests/command_mgr_unittests.cc b/src/lib/config/tests/command_mgr_unittests.cc
index 59682cd84f..b589c1902b 100644
--- a/src/lib/config/tests/command_mgr_unittests.cc
+++ b/src/lib/config/tests/command_mgr_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 <asiolink/io_service.h>
diff --git a/src/lib/config/tests/config_data_unittests.cc b/src/lib/config/tests/config_data_unittests.cc
index 9c847237e0..22d68caaec 100644
--- a/src/lib/config/tests/config_data_unittests.cc
+++ b/src/lib/config/tests/config_data_unittests.cc
@@ -5,6 +5,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 <config/tests/data_def_unittests_config.h>
diff --git a/src/lib/config/tests/module_spec_unittests.cc b/src/lib/config/tests/module_spec_unittests.cc
index 5d1aa2a75d..ee6f4bc6e5 100644
--- a/src/lib/config/tests/module_spec_unittests.cc
+++ b/src/lib/config/tests/module_spec_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 <config/module_spec.h>
diff --git a/src/lib/config/tests/run_unittests.cc b/src/lib/config/tests/run_unittests.cc
index c996e816d2..fc385f9f5e 100644
--- a/src/lib/config/tests/run_unittests.cc
+++ b/src/lib/config/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
#include <log/logger_support.h>
diff --git a/src/lib/cryptolink/botan_hash.cc b/src/lib/cryptolink/botan_hash.cc
index 0ed47e50b8..65bae22d83 100644
--- a/src/lib/cryptolink/botan_hash.cc
+++ b/src/lib/cryptolink/botan_hash.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 <cryptolink.h>
#include <cryptolink/crypto_hash.h>
diff --git a/src/lib/cryptolink/botan_hmac.cc b/src/lib/cryptolink/botan_hmac.cc
index 6c34527a3b..b344de5b10 100644
--- a/src/lib/cryptolink/botan_hmac.cc
+++ b/src/lib/cryptolink/botan_hmac.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 <cryptolink.h>
#include <cryptolink/crypto_hmac.h>
diff --git a/src/lib/cryptolink/botan_link.cc b/src/lib/cryptolink/botan_link.cc
index 57ff19dbe7..f57cb45dd3 100644
--- a/src/lib/cryptolink/botan_link.cc
+++ b/src/lib/cryptolink/botan_link.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 <cryptolink/cryptolink.h>
#include <cryptolink/crypto_hash.h>
#include <cryptolink/crypto_hmac.h>
diff --git a/src/lib/cryptolink/crypto_hash.cc b/src/lib/cryptolink/crypto_hash.cc
index 9c4a96f1c6..524ee22003 100644
--- a/src/lib/cryptolink/crypto_hash.cc
+++ b/src/lib/cryptolink/crypto_hash.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 <cryptolink.h>
#include <cryptolink/crypto_hash.h>
diff --git a/src/lib/cryptolink/crypto_hmac.cc b/src/lib/cryptolink/crypto_hmac.cc
index 8b02fc2ab4..23ce242f12 100644
--- a/src/lib/cryptolink/crypto_hmac.cc
+++ b/src/lib/cryptolink/crypto_hmac.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 <cryptolink.h>
#include <cryptolink/crypto_hmac.h>
diff --git a/src/lib/cryptolink/cryptolink.cc b/src/lib/cryptolink/cryptolink.cc
index d3e4733166..3bae155ce5 100644
--- a/src/lib/cryptolink/cryptolink.cc
+++ b/src/lib/cryptolink/cryptolink.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 <cryptolink/cryptolink.h>
#include <cryptolink/crypto_hash.h>
#include <cryptolink/crypto_hmac.h>
diff --git a/src/lib/cryptolink/openssl_hash.cc b/src/lib/cryptolink/openssl_hash.cc
index 4d68a32033..b3819d6184 100644
--- a/src/lib/cryptolink/openssl_hash.cc
+++ b/src/lib/cryptolink/openssl_hash.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 <cryptolink.h>
#include <cryptolink/crypto_hash.h>
diff --git a/src/lib/cryptolink/openssl_hmac.cc b/src/lib/cryptolink/openssl_hmac.cc
index 5529858371..7d04685889 100644
--- a/src/lib/cryptolink/openssl_hmac.cc
+++ b/src/lib/cryptolink/openssl_hmac.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 <cryptolink.h>
#include <cryptolink/crypto_hmac.h>
diff --git a/src/lib/cryptolink/openssl_link.cc b/src/lib/cryptolink/openssl_link.cc
index f7914992a5..dac6ee4fd1 100644
--- a/src/lib/cryptolink/openssl_link.cc
+++ b/src/lib/cryptolink/openssl_link.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 <cryptolink/cryptolink.h>
#include <cryptolink/crypto_hash.h>
#include <cryptolink/crypto_hmac.h>
diff --git a/src/lib/cryptolink/tests/run_unittests.cc b/src/lib/cryptolink/tests/run_unittests.cc
index 59c202c718..9f3b06f39c 100644
--- a/src/lib/cryptolink/tests/run_unittests.cc
+++ b/src/lib/cryptolink/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 <util/unittests/run_all.h>
diff --git a/src/lib/dhcp/duid.cc b/src/lib/dhcp/duid.cc
index f500ad155e..373c26c0c0 100644
--- a/src/lib/dhcp/duid.cc
+++ b/src/lib/dhcp/duid.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/duid.h>
#include <exceptions/exceptions.h>
#include <util/io_utilities.h>
diff --git a/src/lib/dhcp/duid_factory.cc b/src/lib/dhcp/duid_factory.cc
index c19fcd4462..a751f9b252 100644
--- a/src/lib/dhcp/duid_factory.cc
+++ b/src/lib/dhcp/duid_factory.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/duid_factory.h>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dhcp/hwaddr.cc b/src/lib/dhcp/hwaddr.cc
index 92f62247e4..9416f2d412 100644
--- a/src/lib/dhcp/hwaddr.cc
+++ b/src/lib/dhcp/hwaddr.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/hwaddr.h>
#include <dhcp/dhcp4.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dhcp/opaque_data_tuple.cc b/src/lib/dhcp/opaque_data_tuple.cc
index 8205c9f0b3..0694c31ebc 100644
--- a/src/lib/dhcp/opaque_data_tuple.cc
+++ b/src/lib/dhcp/opaque_data_tuple.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/opaque_data_tuple.h>
namespace isc {
diff --git a/src/lib/dhcp/option4_addrlst.cc b/src/lib/dhcp/option4_addrlst.cc
index d83aa7022d..b6a1cb3a05 100644
--- a/src/lib/dhcp/option4_addrlst.cc
+++ b/src/lib/dhcp/option4_addrlst.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/io_address.h>
#include <dhcp/option4_addrlst.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dhcp/option4_client_fqdn.cc b/src/lib/dhcp/option4_client_fqdn.cc
index add097bf60..f797982d2a 100644
--- a/src/lib/dhcp/option4_client_fqdn.cc
+++ b/src/lib/dhcp/option4_client_fqdn.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/option4_client_fqdn.h>
#include <dns/labelsequence.h>
diff --git a/src/lib/dhcp/option6_client_fqdn.cc b/src/lib/dhcp/option6_client_fqdn.cc
index 77c87ef0d9..a34a56346e 100644
--- a/src/lib/dhcp/option6_client_fqdn.cc
+++ b/src/lib/dhcp/option6_client_fqdn.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/dhcp6.h>
#include <dhcp/option6_client_fqdn.h>
#include <dns/labelsequence.h>
diff --git a/src/lib/dhcp/option_data_types.cc b/src/lib/dhcp/option_data_types.cc
index ff3a6ae19b..e159aa0865 100644
--- a/src/lib/dhcp/option_data_types.cc
+++ b/src/lib/dhcp/option_data_types.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_data_types.h>
#include <dns/labelsequence.h>
#include <dns/name.h>
diff --git a/src/lib/dhcp/option_opaque_data_tuples.cc b/src/lib/dhcp/option_opaque_data_tuples.cc
index 1fc5c614ea..637dcf3de1 100644
--- a/src/lib/dhcp/option_opaque_data_tuples.cc
+++ b/src/lib/dhcp/option_opaque_data_tuples.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/opaque_data_tuple.h>
#include <dhcp/option_opaque_data_tuples.h>
diff --git a/src/lib/dhcp/option_space.cc b/src/lib/dhcp/option_space.cc
index 5f2c332629..3be318bfe7 100644
--- a/src/lib/dhcp/option_space.cc
+++ b/src/lib/dhcp/option_space.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_space.h>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/predicate.hpp>
diff --git a/src/lib/dhcp/option_string.cc b/src/lib/dhcp/option_string.cc
index ddf3052025..1f5c12f329 100644
--- a/src/lib/dhcp/option_string.cc
+++ b/src/lib/dhcp/option_string.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_string.h>
#include <sstream>
diff --git a/src/lib/dhcp/option_vendor_class.cc b/src/lib/dhcp/option_vendor_class.cc
index 1d5d8a8e4b..4a0437516d 100644
--- a/src/lib/dhcp/option_vendor_class.cc
+++ b/src/lib/dhcp/option_vendor_class.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/opaque_data_tuple.h>
#include <dhcp/option_vendor_class.h>
diff --git a/src/lib/dhcp/tests/run_unittests.cc b/src/lib/dhcp/tests/run_unittests.cc
index 5cb81c4a8a..e1c0801f51 100644
--- a/src/lib/dhcp/tests/run_unittests.cc
+++ b/src/lib/dhcp/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/lib/dhcp_ddns/dhcp_ddns_log.cc b/src/lib/dhcp_ddns/dhcp_ddns_log.cc
index 5a7235713f..2be7be58d1 100644
--- a/src/lib/dhcp_ddns/dhcp_ddns_log.cc
+++ b/src/lib/dhcp_ddns/dhcp_ddns_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the top-level component of kea-dhcp_ddns.
+#include <config.h>
+
#include <dhcp_ddns/dhcp_ddns_log.h>
namespace isc {
diff --git a/src/lib/dhcp_ddns/ncr_msg.cc b/src/lib/dhcp_ddns/ncr_msg.cc
index f579a0274a..bf2d085398 100644
--- a/src/lib/dhcp_ddns/ncr_msg.cc
+++ b/src/lib/dhcp_ddns/ncr_msg.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_ddns/ncr_msg.h>
#include <dns/name.h>
#include <asiolink/io_address.h>
diff --git a/src/lib/dhcp_ddns/tests/ncr_unittests.cc b/src/lib/dhcp_ddns/tests/ncr_unittests.cc
index 5cb4a05e6a..fe76829793 100644
--- a/src/lib/dhcp_ddns/tests/ncr_unittests.cc
+++ b/src/lib/dhcp_ddns/tests/ncr_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 <dhcp_ddns/ncr_io.h>
#include <dhcp/duid.h>
#include <dhcp/hwaddr.h>
diff --git a/src/lib/dhcp_ddns/tests/run_unittests.cc b/src/lib/dhcp_ddns/tests/run_unittests.cc
index 5cb81c4a8a..e1c0801f51 100644
--- a/src/lib/dhcp_ddns/tests/run_unittests.cc
+++ b/src/lib/dhcp_ddns/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/lib/dhcp_ddns/tests/test_utils.cc b/src/lib/dhcp_ddns/tests/test_utils.cc
index b61ee1cf99..0671307e7d 100644
--- a/src/lib/dhcp_ddns/tests/test_utils.cc
+++ b/src/lib/dhcp_ddns/tests/test_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 <gtest/gtest.h>
#include <sys/select.h>
diff --git a/src/lib/dhcpsrv/addr_utilities.cc b/src/lib/dhcpsrv/addr_utilities.cc
index 2513a1cee8..005d088005 100644
--- a/src/lib/dhcpsrv/addr_utilities.cc
+++ b/src/lib/dhcpsrv/addr_utilities.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/addr_utilities.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dhcpsrv/alloc_engine_log.cc b/src/lib/dhcpsrv/alloc_engine_log.cc
index 7fe927ee74..3d5fa15d60 100644
--- a/src/lib/dhcpsrv/alloc_engine_log.cc
+++ b/src/lib/dhcpsrv/alloc_engine_log.cc
@@ -6,6 +6,8 @@
/// @brief Defines the logger used by the @c isc::dhcp::AllocEngine
+#include <config.h>
+
#include "dhcpsrv/alloc_engine_log.h"
namespace isc {
diff --git a/src/lib/dhcpsrv/cfg_duid.cc b/src/lib/dhcpsrv/cfg_duid.cc
index fffae1aa7e..5366bbabdf 100644
--- a/src/lib/dhcpsrv/cfg_duid.cc
+++ b/src/lib/dhcpsrv/cfg_duid.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/duid_factory.h>
#include <dhcpsrv/cfg_duid.h>
#include <util/encode/hex.h>
diff --git a/src/lib/dhcpsrv/cfg_expiration.cc b/src/lib/dhcpsrv/cfg_expiration.cc
index f4f1898cf9..2931740b1d 100644
--- a/src/lib/dhcpsrv/cfg_expiration.cc
+++ b/src/lib/dhcpsrv/cfg_expiration.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/cfg_expiration.h>
#include <exceptions/exceptions.h>
#include <limits>
diff --git a/src/lib/dhcpsrv/cfg_host_operations.cc b/src/lib/dhcpsrv/cfg_host_operations.cc
index 662e4cd965..f588b9dc61 100644
--- a/src/lib/dhcpsrv/cfg_host_operations.cc
+++ b/src/lib/dhcpsrv/cfg_host_operations.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/cfg_host_operations.h>
#include <algorithm>
diff --git a/src/lib/dhcpsrv/cfg_option.cc b/src/lib/dhcpsrv/cfg_option.cc
index 5d6c153918..88bc8a3e1a 100644
--- a/src/lib/dhcpsrv/cfg_option.cc
+++ b/src/lib/dhcpsrv/cfg_option.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/libdhcp++.h>
#include <dhcp/option_space.h>
#include <dhcpsrv/cfg_option.h>
diff --git a/src/lib/dhcpsrv/cfg_rsoo.cc b/src/lib/dhcpsrv/cfg_rsoo.cc
index b54262e57f..30f02e67c2 100644
--- a/src/lib/dhcpsrv/cfg_rsoo.cc
+++ b/src/lib/dhcpsrv/cfg_rsoo.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/dhcp6.h>
#include <dhcpsrv/cfg_rsoo.h>
#include <boost/lexical_cast.hpp>
diff --git a/src/lib/dhcpsrv/client_class_def.cc b/src/lib/dhcpsrv/client_class_def.cc
index 135982d708..d2bd3468b9 100644
--- a/src/lib/dhcpsrv/client_class_def.cc
+++ b/src/lib/dhcpsrv/client_class_def.cc
@@ -4,6 +4,9 @@
// 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 "client_class_def.h"
#include <dhcpsrv/client_class_def.h>
#include <dhcpsrv/cfgmgr.h>
#include <boost/foreach.hpp>
diff --git a/src/lib/dhcpsrv/cql_connection.cc b/src/lib/dhcpsrv/cql_connection.cc
index 6959d227a3..f1aceda8b4 100644
--- a/src/lib/dhcpsrv/cql_connection.cc
+++ b/src/lib/dhcpsrv/cql_connection.cc
@@ -14,6 +14,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include <config.h>
+
#include <dhcpsrv/cql_connection.h>
#include <string>
diff --git a/src/lib/dhcpsrv/database_connection.cc b/src/lib/dhcpsrv/database_connection.cc
index 0aa886fa88..bd48009ebd 100644
--- a/src/lib/dhcpsrv/database_connection.cc
+++ b/src/lib/dhcpsrv/database_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 <dhcpsrv/database_connection.h>
#include <dhcpsrv/db_exceptions.h>
#include <dhcpsrv/dhcpsrv_log.h>
diff --git a/src/lib/dhcpsrv/dhcpsrv_log.cc b/src/lib/dhcpsrv/dhcpsrv_log.cc
index 8fe4c462f9..ea2231c3be 100644
--- a/src/lib/dhcpsrv/dhcpsrv_log.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the NSAS
+#include <config.h>
+
#include "dhcpsrv/dhcpsrv_log.h"
namespace isc {
diff --git a/src/lib/dhcpsrv/host_data_source_factory.cc b/src/lib/dhcpsrv/host_data_source_factory.cc
index d19d63dc14..ae72b07263 100644
--- a/src/lib/dhcpsrv/host_data_source_factory.cc
+++ b/src/lib/dhcpsrv/host_data_source_factory.cc
@@ -4,7 +4,7 @@
// 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 <config.h>
#include <dhcpsrv/dhcpsrv_log.h>
#include <dhcpsrv/host_data_source_factory.h>
diff --git a/src/lib/dhcpsrv/hosts_log.cc b/src/lib/dhcpsrv/hosts_log.cc
index 1a3433c192..fbcb97e197 100644
--- a/src/lib/dhcpsrv/hosts_log.cc
+++ b/src/lib/dhcpsrv/hosts_log.cc
@@ -6,6 +6,8 @@
/// @brief Defines the logger used by the @c isc::dhcp::HostMgr
+#include <config.h>
+
#include "dhcpsrv/hosts_log.h"
namespace isc {
diff --git a/src/lib/dhcpsrv/lease.cc b/src/lib/dhcpsrv/lease.cc
index 1aa6e28b70..5fefaf1b3c 100644
--- a/src/lib/dhcpsrv/lease.cc
+++ b/src/lib/dhcpsrv/lease.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/lease.h>
#include <util/pointer_util.h>
#include <sstream>
diff --git a/src/lib/dhcpsrv/mysql_connection.cc b/src/lib/dhcpsrv/mysql_connection.cc
index 9d6954a6ca..317dda13ba 100644
--- a/src/lib/dhcpsrv/mysql_connection.cc
+++ b/src/lib/dhcpsrv/mysql_connection.cc
@@ -5,6 +5,8 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#include <config.h>
+
#include <dhcpsrv/dhcpsrv_log.h>
#include <dhcpsrv/mysql_connection.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dhcpsrv/ncr_generator.cc b/src/lib/dhcpsrv/ncr_generator.cc
index 89b4244303..7b0e9f29d2 100644
--- a/src/lib/dhcpsrv/ncr_generator.cc
+++ b/src/lib/dhcpsrv/ncr_generator.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_data_types.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/dhcpsrv_log.h>
diff --git a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
index 01d35beb25..de0453cda3 100644
--- a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
+++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
@@ -5,6 +5,8 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
+
+#include <cc/data.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/client_class_def.h>
#include <dhcpsrv/parsers/dhcp_parsers.h>
diff --git a/src/lib/dhcpsrv/parsers/expiration_config_parser.cc b/src/lib/dhcpsrv/parsers/expiration_config_parser.cc
index 94e30e9580..57ff60b925 100644
--- a/src/lib/dhcpsrv/parsers/expiration_config_parser.cc
+++ b/src/lib/dhcpsrv/parsers/expiration_config_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/data.h>
#include <dhcpsrv/cfg_expiration.h>
#include <dhcpsrv/cfgmgr.h>
diff --git a/src/lib/dhcpsrv/pgsql_exchange.cc b/src/lib/dhcpsrv/pgsql_exchange.cc
index f643f02ed2..713ad8acd8 100644
--- a/src/lib/dhcpsrv/pgsql_exchange.cc
+++ b/src/lib/dhcpsrv/pgsql_exchange.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/pgsql_exchange.h>
#include <boost/lexical_cast.hpp>
diff --git a/src/lib/dhcpsrv/pool.cc b/src/lib/dhcpsrv/pool.cc
index 77cdc46121..8b815f6666 100644
--- a/src/lib/dhcpsrv/pool.cc
+++ b/src/lib/dhcpsrv/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/io_address.h>
#include <dhcpsrv/addr_utilities.h>
#include <dhcpsrv/pool.h>
diff --git a/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
index 75e46c14b4..1061771f6d 100644
--- a/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/generic_host_data_source_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 <dhcp/dhcp6.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option4_addrlst.h>
diff --git a/src/lib/dhcpsrv/tests/lease_file_io.cc b/src/lib/dhcpsrv/tests/lease_file_io.cc
index 26da172b82..edeec4f85d 100644
--- a/src/lib/dhcpsrv/tests/lease_file_io.cc
+++ b/src/lib/dhcpsrv/tests/lease_file_io.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/tests/lease_file_io.h>
#include <fstream>
#include <sstream>
diff --git a/src/lib/dhcpsrv/testutils/config_result_check.cc b/src/lib/dhcpsrv/testutils/config_result_check.cc
index 15b6e87856..35b31fe079 100644
--- a/src/lib/dhcpsrv/testutils/config_result_check.cc
+++ b/src/lib/dhcpsrv/testutils/config_result_check.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 <dhcpsrv/testutils/config_result_check.h>
#include <boost/algorithm/string/classification.hpp>
diff --git a/src/lib/dns/benchmarks/message_renderer_bench.cc b/src/lib/dns/benchmarks/message_renderer_bench.cc
index efc23817ef..b2e03c18be 100644
--- a/src/lib/dns/benchmarks/message_renderer_bench.cc
+++ b/src/lib/dns/benchmarks/message_renderer_bench.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 <bench/benchmark.h>
#include <dns/name.h>
diff --git a/src/lib/dns/benchmarks/oldmessagerenderer.cc b/src/lib/dns/benchmarks/oldmessagerenderer.cc
index 46506bf918..e500df9e12 100644
--- a/src/lib/dns/benchmarks/oldmessagerenderer.cc
+++ b/src/lib/dns/benchmarks/oldmessagerenderer.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 <util/buffer.h>
#include <dns/name.h>
diff --git a/src/lib/dns/benchmarks/rdatarender_bench.cc b/src/lib/dns/benchmarks/rdatarender_bench.cc
index 1ce9d8352f..07582765a0 100644
--- a/src/lib/dns/benchmarks/rdatarender_bench.cc
+++ b/src/lib/dns/benchmarks/rdatarender_bench.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 <iostream>
#include <fstream>
#include <string>
diff --git a/src/lib/dns/exceptions.cc b/src/lib/dns/exceptions.cc
index e0a1b791b3..e1643481c3 100644
--- a/src/lib/dns/exceptions.cc
+++ b/src/lib/dns/exceptions.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 <dns/exceptions.h>
#include <dns/rcode.h>
diff --git a/src/lib/dns/master_lexer.cc b/src/lib/dns/master_lexer.cc
index 7679c704b0..c4a8fa5934 100644
--- a/src/lib/dns/master_lexer.cc
+++ b/src/lib/dns/master_lexer.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 <dns/master_lexer.h>
diff --git a/src/lib/dns/master_lexer_inputsource.cc b/src/lib/dns/master_lexer_inputsource.cc
index 86d934e750..841fc6c1bb 100644
--- a/src/lib/dns/master_lexer_inputsource.cc
+++ b/src/lib/dns/master_lexer_inputsource.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 <dns/master_lexer_inputsource.h>
#include <dns/master_lexer.h>
diff --git a/src/lib/dns/master_loader_callbacks.cc b/src/lib/dns/master_loader_callbacks.cc
index e325f77e85..088a223c31 100644
--- a/src/lib/dns/master_loader_callbacks.cc
+++ b/src/lib/dns/master_loader_callbacks.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 <dns/master_loader_callbacks.h>
#include <string>
diff --git a/src/lib/dns/masterload.cc b/src/lib/dns/masterload.cc
index 84e5b3731e..bbb9597272 100644
--- a/src/lib/dns/masterload.cc
+++ b/src/lib/dns/masterload.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 <istream>
#include <fstream>
#include <sstream>
diff --git a/src/lib/dns/message.cc b/src/lib/dns/message.cc
index 6d442fbc08..1e7bb7b594 100644
--- a/src/lib/dns/message.cc
+++ b/src/lib/dns/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 <stdint.h>
#include <algorithm>
diff --git a/src/lib/dns/messagerenderer.cc b/src/lib/dns/messagerenderer.cc
index 8b56a70197..81b2c92dd2 100644
--- a/src/lib/dns/messagerenderer.cc
+++ b/src/lib/dns/messagerenderer.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 <util/buffer.h>
#include <dns/name.h>
diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc
index e3809b0f5f..94dd25e9b2 100644
--- a/src/lib/dns/name.cc
+++ b/src/lib/dns/name.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 <cctype>
#include <cassert>
#include <iterator>
diff --git a/src/lib/dns/nsec3hash.cc b/src/lib/dns/nsec3hash.cc
index 4f787d3936..6513f2354e 100644
--- a/src/lib/dns/nsec3hash.cc
+++ b/src/lib/dns/nsec3hash.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 <cassert>
diff --git a/src/lib/dns/opcode.cc b/src/lib/dns/opcode.cc
index e166b71b10..c6e051a7a9 100644
--- a/src/lib/dns/opcode.cc
+++ b/src/lib/dns/opcode.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 <string>
#include <ostream>
diff --git a/src/lib/dns/question.cc b/src/lib/dns/question.cc
index ace35c3c84..f0170d8812 100644
--- a/src/lib/dns/question.cc
+++ b/src/lib/dns/question.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 <iostream>
#include <string>
diff --git a/src/lib/dns/rcode.cc b/src/lib/dns/rcode.cc
index cea0626c76..34d93ce43a 100644
--- a/src/lib/dns/rcode.cc
+++ b/src/lib/dns/rcode.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 <string>
#include <sstream>
#include <ostream>
diff --git a/src/lib/dns/rdata/ch_3/a_1.cc b/src/lib/dns/rdata/ch_3/a_1.cc
index 55a7ec00ed..cd4c824cac 100644
--- a/src/lib/dns/rdata/ch_3/a_1.cc
+++ b/src/lib/dns/rdata/ch_3/a_1.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 <string>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/rdata/generic/afsdb_18.cc b/src/lib/dns/rdata/generic/afsdb_18.cc
index 9f1bf41645..5e82b03efa 100644
--- a/src/lib/dns/rdata/generic/afsdb_18.cc
+++ b/src/lib/dns/rdata/generic/afsdb_18.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 <string>
#include <sstream>
diff --git a/src/lib/dns/rdata/generic/detail/char_string.cc b/src/lib/dns/rdata/generic/detail/char_string.cc
index 2354329474..8eee8c0edc 100644
--- a/src/lib/dns/rdata/generic/detail/char_string.cc
+++ b/src/lib/dns/rdata/generic/detail/char_string.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 <dns/exceptions.h>
diff --git a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
index 28c93e8272..efe488a8a1 100644
--- a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec3param_common.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 <util/encode/hex.h>
diff --git a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
index 756f6f0c6e..d02c11d04e 100644
--- a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec_bitmap.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 <dns/exceptions.h>
diff --git a/src/lib/dns/rdata/generic/dlv_32769.cc b/src/lib/dns/rdata/generic/dlv_32769.cc
index ee23cf8413..66303b7a57 100644
--- a/src/lib/dns/rdata/generic/dlv_32769.cc
+++ b/src/lib/dns/rdata/generic/dlv_32769.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 <string>
#include <util/buffer.h>
diff --git a/src/lib/dns/rdata/generic/ds_43.cc b/src/lib/dns/rdata/generic/ds_43.cc
index f4d9f189c7..48c421c4d8 100644
--- a/src/lib/dns/rdata/generic/ds_43.cc
+++ b/src/lib/dns/rdata/generic/ds_43.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 <string>
#include <util/buffer.h>
diff --git a/src/lib/dns/rdata/generic/minfo_14.cc b/src/lib/dns/rdata/generic/minfo_14.cc
index 178b59d315..d3dfd1e630 100644
--- a/src/lib/dns/rdata/generic/minfo_14.cc
+++ b/src/lib/dns/rdata/generic/minfo_14.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 <string>
#include <sstream>
diff --git a/src/lib/dns/rdata/generic/nsec_47.cc b/src/lib/dns/rdata/generic/nsec_47.cc
index 8bbf8664db..f8af0e0142 100644
--- a/src/lib/dns/rdata/generic/nsec_47.cc
+++ b/src/lib/dns/rdata/generic/nsec_47.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 <iostream>
#include <string>
#include <sstream>
diff --git a/src/lib/dns/rdata/generic/rp_17.cc b/src/lib/dns/rdata/generic/rp_17.cc
index 92bab7406d..43bf64761e 100644
--- a/src/lib/dns/rdata/generic/rp_17.cc
+++ b/src/lib/dns/rdata/generic/rp_17.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 <string>
#include <sstream>
diff --git a/src/lib/dns/rdata/generic/spf_99.cc b/src/lib/dns/rdata/generic/spf_99.cc
index 1936f13316..f25585ab53 100644
--- a/src/lib/dns/rdata/generic/spf_99.cc
+++ b/src/lib/dns/rdata/generic/spf_99.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 <string.h>
diff --git a/src/lib/dns/rdata/generic/txt_16.cc b/src/lib/dns/rdata/generic/txt_16.cc
index 87d2361a13..52d6b6473c 100644
--- a/src/lib/dns/rdata/generic/txt_16.cc
+++ b/src/lib/dns/rdata/generic/txt_16.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 <string.h>
diff --git a/src/lib/dns/rdata/hs_4/a_1.cc b/src/lib/dns/rdata/hs_4/a_1.cc
index 55a7ec00ed..cd4c824cac 100644
--- a/src/lib/dns/rdata/hs_4/a_1.cc
+++ b/src/lib/dns/rdata/hs_4/a_1.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 <string>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/rdata/in_1/a_1.cc b/src/lib/dns/rdata/in_1/a_1.cc
index 01428bfc3a..c6585b98eb 100644
--- a/src/lib/dns/rdata/in_1/a_1.cc
+++ b/src/lib/dns/rdata/in_1/a_1.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 <string.h>
diff --git a/src/lib/dns/rdata/in_1/aaaa_28.cc b/src/lib/dns/rdata/in_1/aaaa_28.cc
index e1fc39ca84..c967935e8d 100644
--- a/src/lib/dns/rdata/in_1/aaaa_28.cc
+++ b/src/lib/dns/rdata/in_1/aaaa_28.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 <util/buffer.h>
#include <dns/exceptions.h>
diff --git a/src/lib/dns/rdata/in_1/dhcid_49.cc b/src/lib/dns/rdata/in_1/dhcid_49.cc
index 331770836c..57c79c2d23 100644
--- a/src/lib/dns/rdata/in_1/dhcid_49.cc
+++ b/src/lib/dns/rdata/in_1/dhcid_49.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 <string.h>
diff --git a/src/lib/dns/rdata/in_1/srv_33.cc b/src/lib/dns/rdata/in_1/srv_33.cc
index c832d7ceca..a8a050ca27 100644
--- a/src/lib/dns/rdata/in_1/srv_33.cc
+++ b/src/lib/dns/rdata/in_1/srv_33.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 <iostream>
#include <sstream>
diff --git a/src/lib/dns/rdata/template.cc b/src/lib/dns/rdata/template.cc
index ed1803e9d7..d20585597a 100644
--- a/src/lib/dns/rdata/template.cc
+++ b/src/lib/dns/rdata/template.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 <string>
#include <util/buffer.h>
diff --git a/src/lib/dns/rdatafields.cc b/src/lib/dns/rdatafields.cc
index bc41aba758..e02ec8ff87 100644
--- a/src/lib/dns/rdatafields.cc
+++ b/src/lib/dns/rdatafields.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 <cassert>
diff --git a/src/lib/dns/rrclass.cc b/src/lib/dns/rrclass.cc
index 1524149e1e..4617a3e16a 100644
--- a/src/lib/dns/rrclass.cc
+++ b/src/lib/dns/rrclass.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 <string>
diff --git a/src/lib/dns/rrcollator.cc b/src/lib/dns/rrcollator.cc
index e879e3eb92..e2fa0e4460 100644
--- a/src/lib/dns/rrcollator.cc
+++ b/src/lib/dns/rrcollator.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 this first to check the header is self-contained.
diff --git a/src/lib/dns/rrparamregistry-placeholder.cc b/src/lib/dns/rrparamregistry-placeholder.cc
index c28a7d989c..455c117d69 100644
--- a/src/lib/dns/rrparamregistry-placeholder.cc
+++ b/src/lib/dns/rrparamregistry-placeholder.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 <cassert>
#include <algorithm>
#include <cctype>
diff --git a/src/lib/dns/rrparamregistry.cc b/src/lib/dns/rrparamregistry.cc
index aafa96636f..4850593428 100644
--- a/src/lib/dns/rrparamregistry.cc
+++ b/src/lib/dns/rrparamregistry.cc
@@ -11,6 +11,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 <cassert>
#include <algorithm>
#include <cctype>
diff --git a/src/lib/dns/rrset.cc b/src/lib/dns/rrset.cc
index e0c90459a4..e2b6a48690 100644
--- a/src/lib/dns/rrset.cc
+++ b/src/lib/dns/rrset.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 <algorithm>
#include <string>
#include <vector>
diff --git a/src/lib/dns/rrset_collection.cc b/src/lib/dns/rrset_collection.cc
index 197f81410b..54503044b0 100644
--- a/src/lib/dns/rrset_collection.cc
+++ b/src/lib/dns/rrset_collection.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 <dns/rrset_collection.h>
#include <dns/master_loader_callbacks.h>
#include <dns/master_loader.h>
diff --git a/src/lib/dns/rrttl.cc b/src/lib/dns/rrttl.cc
index dde905a24d..83877c74ed 100644
--- a/src/lib/dns/rrttl.cc
+++ b/src/lib/dns/rrttl.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 <sstream>
diff --git a/src/lib/dns/rrtype.cc b/src/lib/dns/rrtype.cc
index 6be6ee8e45..242af518ba 100644
--- a/src/lib/dns/rrtype.cc
+++ b/src/lib/dns/rrtype.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 <string>
diff --git a/src/lib/dns/serial.cc b/src/lib/dns/serial.cc
index 2c50d332bb..842bff838c 100644
--- a/src/lib/dns/serial.cc
+++ b/src/lib/dns/serial.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 <dns/serial.h>
namespace isc {
diff --git a/src/lib/dns/tests/dns_exceptions_unittest.cc b/src/lib/dns/tests/dns_exceptions_unittest.cc
index 10ea1ef644..a8d25907c7 100644
--- a/src/lib/dns/tests/dns_exceptions_unittest.cc
+++ b/src/lib/dns/tests/dns_exceptions_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 <dns/exceptions.h>
#include <gtest/gtest.h>
diff --git a/src/lib/dns/tests/edns_unittest.cc b/src/lib/dns/tests/edns_unittest.cc
index 81f9df6d31..dfc68cc67e 100644
--- a/src/lib/dns/tests/edns_unittest.cc
+++ b/src/lib/dns/tests/edns_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 <sstream>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tests/master_lexer_inputsource_unittest.cc b/src/lib/dns/tests/master_lexer_inputsource_unittest.cc
index 88e1fdcbc4..c5f618af06 100644
--- a/src/lib/dns/tests/master_lexer_inputsource_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_inputsource_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 <dns/master_lexer_inputsource.h>
#include <dns/master_lexer.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tests/master_lexer_state_unittest.cc b/src/lib/dns/tests/master_lexer_state_unittest.cc
index 56ed5187a3..e810136068 100644
--- a/src/lib/dns/tests/master_lexer_state_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_state_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 <dns/master_lexer.h>
#include <dns/master_lexer_inputsource.h>
#include <dns/master_lexer_state.h>
diff --git a/src/lib/dns/tests/master_lexer_token_unittest.cc b/src/lib/dns/tests/master_lexer_token_unittest.cc
index 019679c3ac..2167a9f5e6 100644
--- a/src/lib/dns/tests/master_lexer_token_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_token_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 <dns/master_lexer.h>
diff --git a/src/lib/dns/tests/master_lexer_unittest.cc b/src/lib/dns/tests/master_lexer_unittest.cc
index 281f43f390..e19c7c31b6 100644
--- a/src/lib/dns/tests/master_lexer_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_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 <dns/master_lexer.h>
diff --git a/src/lib/dns/tests/master_loader_callbacks_test.cc b/src/lib/dns/tests/master_loader_callbacks_test.cc
index c0472507ad..e66f92857b 100644
--- a/src/lib/dns/tests/master_loader_callbacks_test.cc
+++ b/src/lib/dns/tests/master_loader_callbacks_test.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 <dns/master_loader_callbacks.h>
#include <dns/rrset.h>
#include <dns/name.h>
diff --git a/src/lib/dns/tests/master_loader_unittest.cc b/src/lib/dns/tests/master_loader_unittest.cc
index 6ef0147e0d..6a7f95a1c9 100644
--- a/src/lib/dns/tests/master_loader_unittest.cc
+++ b/src/lib/dns/tests/master_loader_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 <dns/master_loader_callbacks.h>
#include <dns/master_loader.h>
#include <dns/rrtype.h>
diff --git a/src/lib/dns/tests/masterload_unittest.cc b/src/lib/dns/tests/masterload_unittest.cc
index a4c719d09c..a6ca54694a 100644
--- a/src/lib/dns/tests/masterload_unittest.cc
+++ b/src/lib/dns/tests/masterload_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 <functional>
#include <ios>
#include <fstream>
diff --git a/src/lib/dns/tests/message_unittest.cc b/src/lib/dns/tests/message_unittest.cc
index 01c2d055c2..8b6832b7dc 100644
--- a/src/lib/dns/tests/message_unittest.cc
+++ b/src/lib/dns/tests/message_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 <fstream>
#include <boost/scoped_ptr.hpp>
diff --git a/src/lib/dns/tests/messagerenderer_unittest.cc b/src/lib/dns/tests/messagerenderer_unittest.cc
index f5a85dd23a..331ab60dc5 100644
--- a/src/lib/dns/tests/messagerenderer_unittest.cc
+++ b/src/lib/dns/tests/messagerenderer_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 <util/buffer.h>
#include <dns/name.h>
diff --git a/src/lib/dns/tests/name_unittest.cc b/src/lib/dns/tests/name_unittest.cc
index 5f9813034b..d6ef1b2782 100644
--- a/src/lib/dns/tests/name_unittest.cc
+++ b/src/lib/dns/tests/name_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 <vector>
#include <string>
#include <sstream>
diff --git a/src/lib/dns/tests/nsec3hash_unittest.cc b/src/lib/dns/tests/nsec3hash_unittest.cc
index 9917268909..b47bb4969b 100644
--- a/src/lib/dns/tests/nsec3hash_unittest.cc
+++ b/src/lib/dns/tests/nsec3hash_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 <string>
#include <gtest/gtest.h>
diff --git a/src/lib/dns/tests/opcode_unittest.cc b/src/lib/dns/tests/opcode_unittest.cc
index 87df0841c1..9bc60b5b7e 100644
--- a/src/lib/dns/tests/opcode_unittest.cc
+++ b/src/lib/dns/tests/opcode_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 <vector>
#include <sstream>
diff --git a/src/lib/dns/tests/question_unittest.cc b/src/lib/dns/tests/question_unittest.cc
index e091f65242..03d31b1018 100644
--- a/src/lib/dns/tests/question_unittest.cc
+++ b/src/lib/dns/tests/question_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 <vector>
#include <sstream>
diff --git a/src/lib/dns/tests/rcode_unittest.cc b/src/lib/dns/tests/rcode_unittest.cc
index 15f484846e..220248f062 100644
--- a/src/lib/dns/tests/rcode_unittest.cc
+++ b/src/lib/dns/tests/rcode_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 <vector>
#include <sstream>
diff --git a/src/lib/dns/tests/rdata_afsdb_unittest.cc b/src/lib/dns/tests/rdata_afsdb_unittest.cc
index 502e274038..81372ccc4f 100644
--- a/src/lib/dns/tests/rdata_afsdb_unittest.cc
+++ b/src/lib/dns/tests/rdata_afsdb_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_caa_unittest.cc b/src/lib/dns/tests/rdata_caa_unittest.cc
index 8f6eb4ecb5..48b9076d18 100644
--- a/src/lib/dns/tests/rdata_caa_unittest.cc
+++ b/src/lib/dns/tests/rdata_caa_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 <algorithm>
#include <string>
diff --git a/src/lib/dns/tests/rdata_char_string_data_unittest.cc b/src/lib/dns/tests/rdata_char_string_data_unittest.cc
index 5ef9e28e7a..4ffeadb593 100644
--- a/src/lib/dns/tests/rdata_char_string_data_unittest.cc
+++ b/src/lib/dns/tests/rdata_char_string_data_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 <util/unittests/wiredata.h>
#include <dns/exceptions.h>
diff --git a/src/lib/dns/tests/rdata_char_string_unittest.cc b/src/lib/dns/tests/rdata_char_string_unittest.cc
index 7b830b92bd..f1618b526c 100644
--- a/src/lib/dns/tests/rdata_char_string_unittest.cc
+++ b/src/lib/dns/tests/rdata_char_string_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 <util/unittests/wiredata.h>
#include <dns/exceptions.h>
diff --git a/src/lib/dns/tests/rdata_cname_unittest.cc b/src/lib/dns/tests/rdata_cname_unittest.cc
index 5834ecae24..e6663559d2 100644
--- a/src/lib/dns/tests/rdata_cname_unittest.cc
+++ b/src/lib/dns/tests/rdata_cname_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_dhcid_unittest.cc b/src/lib/dns/tests/rdata_dhcid_unittest.cc
index 1e32eb195d..a96c3e4547 100644
--- a/src/lib/dns/tests/rdata_dhcid_unittest.cc
+++ b/src/lib/dns/tests/rdata_dhcid_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 <util/buffer.h>
diff --git a/src/lib/dns/tests/rdata_dname_unittest.cc b/src/lib/dns/tests/rdata_dname_unittest.cc
index 31aaa74342..3bdfb235b3 100644
--- a/src/lib/dns/tests/rdata_dname_unittest.cc
+++ b/src/lib/dns/tests/rdata_dname_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_dnskey_unittest.cc b/src/lib/dns/tests/rdata_dnskey_unittest.cc
index b2e4962177..6f0866df73 100644
--- a/src/lib/dns/tests/rdata_dnskey_unittest.cc
+++ b/src/lib/dns/tests/rdata_dnskey_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 <string>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tests/rdata_ds_like_unittest.cc b/src/lib/dns/tests/rdata_ds_like_unittest.cc
index 2c6bdee4c5..df72c54c6a 100644
--- a/src/lib/dns/tests/rdata_ds_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_ds_like_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 <algorithm>
#include <string>
diff --git a/src/lib/dns/tests/rdata_hinfo_unittest.cc b/src/lib/dns/tests/rdata_hinfo_unittest.cc
index 0d3fae3b7d..1830f0550e 100644
--- a/src/lib/dns/tests/rdata_hinfo_unittest.cc
+++ b/src/lib/dns/tests/rdata_hinfo_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_in_a_unittest.cc b/src/lib/dns/tests/rdata_in_a_unittest.cc
index 28345d75f8..809cfb5bd4 100644
--- a/src/lib/dns/tests/rdata_in_a_unittest.cc
+++ b/src/lib/dns/tests/rdata_in_a_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 <dns/rdataclass.h>
#include <util/buffer.h>
diff --git a/src/lib/dns/tests/rdata_in_aaaa_unittest.cc b/src/lib/dns/tests/rdata_in_aaaa_unittest.cc
index b1e0e9810e..cc7b07d8c6 100644
--- a/src/lib/dns/tests/rdata_in_aaaa_unittest.cc
+++ b/src/lib/dns/tests/rdata_in_aaaa_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_minfo_unittest.cc b/src/lib/dns/tests/rdata_minfo_unittest.cc
index 4259567700..fa2393d0ce 100644
--- a/src/lib/dns/tests/rdata_minfo_unittest.cc
+++ b/src/lib/dns/tests/rdata_minfo_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 <string>
#include <util/buffer.h>
diff --git a/src/lib/dns/tests/rdata_mx_unittest.cc b/src/lib/dns/tests/rdata_mx_unittest.cc
index 53676d538c..b11411f24c 100644
--- a/src/lib/dns/tests/rdata_mx_unittest.cc
+++ b/src/lib/dns/tests/rdata_mx_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 <util/buffer.h>
#include <dns/messagerenderer.h>
#include <dns/rdata.h>
diff --git a/src/lib/dns/tests/rdata_naptr_unittest.cc b/src/lib/dns/tests/rdata_naptr_unittest.cc
index fc6a2765f7..871424ac8e 100644
--- a/src/lib/dns/tests/rdata_naptr_unittest.cc
+++ b/src/lib/dns/tests/rdata_naptr_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_ns_unittest.cc b/src/lib/dns/tests/rdata_ns_unittest.cc
index 1ae7a0ae60..31bb50800e 100644
--- a/src/lib/dns/tests/rdata_ns_unittest.cc
+++ b/src/lib/dns/tests/rdata_ns_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_nsec3_unittest.cc b/src/lib/dns/tests/rdata_nsec3_unittest.cc
index 457a980e4d..c6d3a07a72 100644
--- a/src/lib/dns/tests/rdata_nsec3_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3_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 <string>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
index 32cde683bf..344ef69f24 100644
--- a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3param_like_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 <dns/exceptions.h>
#include <dns/rdata.h>
#include <dns/rdataclass.h>
diff --git a/src/lib/dns/tests/rdata_nsec3param_unittest.cc b/src/lib/dns/tests/rdata_nsec3param_unittest.cc
index e67c584684..9a677be145 100644
--- a/src/lib/dns/tests/rdata_nsec3param_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3param_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 <string>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tests/rdata_nsec_unittest.cc b/src/lib/dns/tests/rdata_nsec_unittest.cc
index fb47b01c47..570a2abb58 100644
--- a/src/lib/dns/tests/rdata_nsec_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec_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 <string>
#include <util/buffer.h>
diff --git a/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc b/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
index fb9ae310f8..e50a430363 100644
--- a/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsecbitmap_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 <dns/tests/unittest_util.h>
#include <dns/exceptions.h>
diff --git a/src/lib/dns/tests/rdata_opt_unittest.cc b/src/lib/dns/tests/rdata_opt_unittest.cc
index 4e55361d92..a235183529 100644
--- a/src/lib/dns/tests/rdata_opt_unittest.cc
+++ b/src/lib/dns/tests/rdata_opt_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 <util/buffer.h>
#include <dns/messagerenderer.h>
#include <dns/rdata.h>
diff --git a/src/lib/dns/tests/rdata_pimpl_holder_unittest.cc b/src/lib/dns/tests/rdata_pimpl_holder_unittest.cc
index fd85fa0654..d639541949 100644
--- a/src/lib/dns/tests/rdata_pimpl_holder_unittest.cc
+++ b/src/lib/dns/tests/rdata_pimpl_holder_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 <dns/rdata_pimpl_holder.h>
#include <gtest/gtest.h>
diff --git a/src/lib/dns/tests/rdata_ptr_unittest.cc b/src/lib/dns/tests/rdata_ptr_unittest.cc
index b071420c09..5ed3bce0f8 100644
--- a/src/lib/dns/tests/rdata_ptr_unittest.cc
+++ b/src/lib/dns/tests/rdata_ptr_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_rp_unittest.cc b/src/lib/dns/tests/rdata_rp_unittest.cc
index 524b937d19..e752f13772 100644
--- a/src/lib/dns/tests/rdata_rp_unittest.cc
+++ b/src/lib/dns/tests/rdata_rp_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 <string>
#include <util/buffer.h>
diff --git a/src/lib/dns/tests/rdata_rrsig_unittest.cc b/src/lib/dns/tests/rdata_rrsig_unittest.cc
index a4abb6843e..b198d15c62 100644
--- a/src/lib/dns/tests/rdata_rrsig_unittest.cc
+++ b/src/lib/dns/tests/rdata_rrsig_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 <util/buffer.h>
diff --git a/src/lib/dns/tests/rdata_soa_unittest.cc b/src/lib/dns/tests/rdata_soa_unittest.cc
index bca07fd28d..21f4dc4854 100644
--- a/src/lib/dns/tests/rdata_soa_unittest.cc
+++ b/src/lib/dns/tests/rdata_soa_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 <util/buffer.h>
#include <dns/messagerenderer.h>
#include <dns/rdata.h>
diff --git a/src/lib/dns/tests/rdata_srv_unittest.cc b/src/lib/dns/tests/rdata_srv_unittest.cc
index 3b0d734e9a..b9842af970 100644
--- a/src/lib/dns/tests/rdata_srv_unittest.cc
+++ b/src/lib/dns/tests/rdata_srv_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 <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
diff --git a/src/lib/dns/tests/rdata_sshfp_unittest.cc b/src/lib/dns/tests/rdata_sshfp_unittest.cc
index 303c1ed3b2..2bf88f38ef 100644
--- a/src/lib/dns/tests/rdata_sshfp_unittest.cc
+++ b/src/lib/dns/tests/rdata_sshfp_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 <algorithm>
#include <string>
diff --git a/src/lib/dns/tests/rdata_tlsa_unittest.cc b/src/lib/dns/tests/rdata_tlsa_unittest.cc
index 637f3bbcff..92970cb011 100644
--- a/src/lib/dns/tests/rdata_tlsa_unittest.cc
+++ b/src/lib/dns/tests/rdata_tlsa_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 <algorithm>
#include <string>
diff --git a/src/lib/dns/tests/rdata_tsig_unittest.cc b/src/lib/dns/tests/rdata_tsig_unittest.cc
index fc83220ad0..808a260f8a 100644
--- a/src/lib/dns/tests/rdata_tsig_unittest.cc
+++ b/src/lib/dns/tests/rdata_tsig_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 <string>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tests/rdata_txt_like_unittest.cc b/src/lib/dns/tests/rdata_txt_like_unittest.cc
index 0774fb1a5c..19ada1d69f 100644
--- a/src/lib/dns/tests/rdata_txt_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_txt_like_unittest.cc
@@ -6,6 +6,8 @@
// This is the common code for TXT and SPF tests.
+#include <config.h>
+
#include <util/buffer.h>
#include <dns/exceptions.h>
#include <dns/rdataclass.h>
diff --git a/src/lib/dns/tests/rdata_unittest.cc b/src/lib/dns/tests/rdata_unittest.cc
index 2fc4f4e773..fa02808dce 100644
--- a/src/lib/dns/tests/rdata_unittest.cc
+++ b/src/lib/dns/tests/rdata_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 <vector>
#include <string>
#include <sstream>
diff --git a/src/lib/dns/tests/rdatafields_unittest.cc b/src/lib/dns/tests/rdatafields_unittest.cc
index 1f9e09343b..0531439574 100644
--- a/src/lib/dns/tests/rdatafields_unittest.cc
+++ b/src/lib/dns/tests/rdatafields_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 <vector>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tests/rrclass_unittest.cc b/src/lib/dns/tests/rrclass_unittest.cc
index 0bcfeeb0e2..ff08be65fb 100644
--- a/src/lib/dns/tests/rrclass_unittest.cc
+++ b/src/lib/dns/tests/rrclass_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 <util/buffer.h>
diff --git a/src/lib/dns/tests/rrcollator_unittest.cc b/src/lib/dns/tests/rrcollator_unittest.cc
index ffbb79591f..3bd1696b61 100644
--- a/src/lib/dns/tests/rrcollator_unittest.cc
+++ b/src/lib/dns/tests/rrcollator_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 <dns/name.h>
diff --git a/src/lib/dns/tests/rrparamregistry_unittest.cc b/src/lib/dns/tests/rrparamregistry_unittest.cc
index b2e58eb534..103b55c5c5 100644
--- a/src/lib/dns/tests/rrparamregistry_unittest.cc
+++ b/src/lib/dns/tests/rrparamregistry_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 <string>
#include <sstream>
diff --git a/src/lib/dns/tests/rrset_collection_unittest.cc b/src/lib/dns/tests/rrset_collection_unittest.cc
index 5241143a4e..be16ab5b51 100644
--- a/src/lib/dns/tests/rrset_collection_unittest.cc
+++ b/src/lib/dns/tests/rrset_collection_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 <dns/rrset_collection.h>
#include <dns/rrttl.h>
#include <dns/rdataclass.h>
diff --git a/src/lib/dns/tests/rrset_unittest.cc b/src/lib/dns/tests/rrset_unittest.cc
index b919c915c4..04258126a5 100644
--- a/src/lib/dns/tests/rrset_unittest.cc
+++ b/src/lib/dns/tests/rrset_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 <util/buffer.h>
#include <dns/messagerenderer.h>
#include <dns/name.h>
diff --git a/src/lib/dns/tests/rrttl_unittest.cc b/src/lib/dns/tests/rrttl_unittest.cc
index 679193e184..3cada14cbc 100644
--- a/src/lib/dns/tests/rrttl_unittest.cc
+++ b/src/lib/dns/tests/rrttl_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 <util/buffer.h>
diff --git a/src/lib/dns/tests/rrtype_unittest.cc b/src/lib/dns/tests/rrtype_unittest.cc
index c0c29f57e6..a2f8ba556d 100644
--- a/src/lib/dns/tests/rrtype_unittest.cc
+++ b/src/lib/dns/tests/rrtype_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 <util/buffer.h>
diff --git a/src/lib/dns/tests/run_unittests.cc b/src/lib/dns/tests/run_unittests.cc
index 0dc5e4d2d8..de396fadb8 100644
--- a/src/lib/dns/tests/run_unittests.cc
+++ b/src/lib/dns/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
diff --git a/src/lib/dns/tests/serial_unittest.cc b/src/lib/dns/tests/serial_unittest.cc
index 0880b62ff1..305b0b0d79 100644
--- a/src/lib/dns/tests/serial_unittest.cc
+++ b/src/lib/dns/tests/serial_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 <dns/serial.h>
diff --git a/src/lib/dns/tests/tsig_unittest.cc b/src/lib/dns/tests/tsig_unittest.cc
index 3f62af63a2..85b75532c9 100644
--- a/src/lib/dns/tests/tsig_unittest.cc
+++ b/src/lib/dns/tests/tsig_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 <time.h>
#include <string>
#include <stdexcept>
diff --git a/src/lib/dns/tests/tsigerror_unittest.cc b/src/lib/dns/tests/tsigerror_unittest.cc
index 6460fa15ee..e50f0763d3 100644
--- a/src/lib/dns/tests/tsigerror_unittest.cc
+++ b/src/lib/dns/tests/tsigerror_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 <string>
#include <ostream>
diff --git a/src/lib/dns/tests/tsigkey_unittest.cc b/src/lib/dns/tests/tsigkey_unittest.cc
index e8d84f5e8d..e28f79eaa0 100644
--- a/src/lib/dns/tests/tsigkey_unittest.cc
+++ b/src/lib/dns/tests/tsigkey_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 <string>
#include <gtest/gtest.h>
diff --git a/src/lib/dns/tests/tsigrecord_unittest.cc b/src/lib/dns/tests/tsigrecord_unittest.cc
index d08421ad9a..d2686feb7c 100644
--- a/src/lib/dns/tests/tsigrecord_unittest.cc
+++ b/src/lib/dns/tests/tsigrecord_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 <vector>
#include <sstream>
diff --git a/src/lib/dns/tests/zone_checker_unittest.cc b/src/lib/dns/tests/zone_checker_unittest.cc
index 1013f6ce32..3a9809f5aa 100644
--- a/src/lib/dns/tests/zone_checker_unittest.cc
+++ b/src/lib/dns/tests/zone_checker_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 <dns/zone_checker.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/tsig.cc b/src/lib/dns/tsig.cc
index 513d5e7ae5..10bc51abbc 100644
--- a/src/lib/dns/tsig.cc
+++ b/src/lib/dns/tsig.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 <sys/time.h>
#include <stdint.h>
diff --git a/src/lib/dns/tsigerror.cc b/src/lib/dns/tsigerror.cc
index 9774d25443..d51094a1be 100644
--- a/src/lib/dns/tsigerror.cc
+++ b/src/lib/dns/tsigerror.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 <ostream>
#include <string>
diff --git a/src/lib/dns/tsigkey.cc b/src/lib/dns/tsigkey.cc
index 9cd8d21c0e..ff355d4fa4 100644
--- a/src/lib/dns/tsigkey.cc
+++ b/src/lib/dns/tsigkey.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 <map>
#include <utility>
#include <vector>
diff --git a/src/lib/dns/tsigrecord.cc b/src/lib/dns/tsigrecord.cc
index 3e29a618b3..483296ded6 100644
--- a/src/lib/dns/tsigrecord.cc
+++ b/src/lib/dns/tsigrecord.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 <ostream>
#include <string>
diff --git a/src/lib/dns/zone_checker.cc b/src/lib/dns/zone_checker.cc
index bf0f4e639c..3447a00d9b 100644
--- a/src/lib/dns/zone_checker.cc
+++ b/src/lib/dns/zone_checker.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 <dns/zone_checker.h>
#include <dns/name.h>
diff --git a/src/lib/eval/eval_context.cc b/src/lib/eval/eval_context.cc
index 322e2e25e6..d96e20cfe7 100644
--- a/src/lib/eval/eval_context.cc
+++ b/src/lib/eval/eval_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 <dhcp/dhcp6.h>
#include <dhcp/option.h>
#include <dhcp/option_definition.h>
diff --git a/src/lib/eval/eval_log.cc b/src/lib/eval/eval_log.cc
index fcbeab051a..6492ad69c7 100644
--- a/src/lib/eval/eval_log.cc
+++ b/src/lib/eval/eval_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the Eval (classification) code
+#include <config.h>
+
#include <eval/eval_log.h>
namespace isc {
diff --git a/src/lib/eval/evaluate.cc b/src/lib/eval/evaluate.cc
index dbc39c54cf..f2cadce925 100644
--- a/src/lib/eval/evaluate.cc
+++ b/src/lib/eval/evaluate.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 <eval/evaluate.h>
namespace isc {
diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc
index a04aed10dc..4718fbae11 100644
--- a/src/lib/eval/lexer.cc
+++ b/src/lib/eval/lexer.cc
@@ -294,6 +294,8 @@
/* 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 f952ef31de..84487c63c7 100644
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -45,6 +45,8 @@
# endif
# endif
+#include <config.h>
+
#include "parser.h"
// User implementation prologue.
diff --git a/src/lib/eval/tests/run_unittests.cc b/src/lib/eval/tests/run_unittests.cc
index fbc187c9ca..08f04d1ba9 100644
--- a/src/lib/eval/tests/run_unittests.cc
+++ b/src/lib/eval/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/lib/eval/token.cc b/src/lib/eval/token.cc
index 1366cab464..e7d06bc801 100644
--- a/src/lib/eval/token.cc
+++ b/src/lib/eval/token.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 <eval/token.h>
#include <eval/eval_log.h>
#include <eval/eval_context.h>
diff --git a/src/lib/exceptions/exceptions.cc b/src/lib/exceptions/exceptions.cc
index 22ee7aaf46..bc0d83ae1c 100644
--- a/src/lib/exceptions/exceptions.cc
+++ b/src/lib/exceptions/exceptions.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 <string>
#include <sstream>
#include <exceptions/exceptions.h>
diff --git a/src/lib/exceptions/tests/exceptions_unittest.cc b/src/lib/exceptions/tests/exceptions_unittest.cc
index e2e632b91b..baa6e9346a 100644
--- a/src/lib/exceptions/tests/exceptions_unittest.cc
+++ b/src/lib/exceptions/tests/exceptions_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 <stdexcept>
#include <string>
diff --git a/src/lib/exceptions/tests/run_unittests.cc b/src/lib/exceptions/tests/run_unittests.cc
index 4df5b5d8f6..92e2240d3d 100644
--- a/src/lib/exceptions/tests/run_unittests.cc
+++ b/src/lib/exceptions/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 <gtest/gtest.h>
int
diff --git a/src/lib/hooks/callout_handle.cc b/src/lib/hooks/callout_handle.cc
index 34c2c4b1fc..2eba4deb94 100644
--- a/src/lib/hooks/callout_handle.cc
+++ b/src/lib/hooks/callout_handle.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 <hooks/callout_handle.h>
#include <hooks/callout_manager.h>
#include <hooks/library_handle.h>
diff --git a/src/lib/hooks/hooks_log.cc b/src/lib/hooks/hooks_log.cc
index 8e554b5166..6f75bc92df 100644
--- a/src/lib/hooks/hooks_log.cc
+++ b/src/lib/hooks/hooks_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the Hooks
+#include <config.h>
+
#include <hooks/hooks_log.h>
#include <log/macros.h>
diff --git a/src/lib/hooks/hooks_manager.cc b/src/lib/hooks/hooks_manager.cc
index b4702baff0..49f67fbb47 100644
--- a/src/lib/hooks/hooks_manager.cc
+++ b/src/lib/hooks/hooks_manager.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 <hooks/callout_handle.h>
#include <hooks/callout_manager.h>
#include <hooks/callout_manager.h>
diff --git a/src/lib/hooks/libinfo.cc b/src/lib/hooks/libinfo.cc
index b55cd91d78..2abf3a1d47 100644
--- a/src/lib/hooks/libinfo.cc
+++ b/src/lib/hooks/libinfo.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 <hooks/libinfo.h>
namespace isc {
diff --git a/src/lib/hooks/library_handle.cc b/src/lib/hooks/library_handle.cc
index 5707dbae52..7aa7a052cc 100644
--- a/src/lib/hooks/library_handle.cc
+++ b/src/lib/hooks/library_handle.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 <hooks/callout_manager.h>
#include <hooks/library_handle.h>
#include <hooks/hooks_manager.h>
diff --git a/src/lib/hooks/library_manager_collection.cc b/src/lib/hooks/library_manager_collection.cc
index ea2daa843f..0063bb1cde 100644
--- a/src/lib/hooks/library_manager_collection.cc
+++ b/src/lib/hooks/library_manager_collection.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 <hooks/callout_manager.h>
#include <hooks/hooks_manager.h>
#include <hooks/library_manager.h>
diff --git a/src/lib/hooks/server_hooks.cc b/src/lib/hooks/server_hooks.cc
index d7cfcdf901..f6357a29c0 100644
--- a/src/lib/hooks/server_hooks.cc
+++ b/src/lib/hooks/server_hooks.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_log.h>
#include <hooks/server_hooks.h>
diff --git a/src/lib/hooks/tests/callout_handle_unittest.cc b/src/lib/hooks/tests/callout_handle_unittest.cc
index 990fca4025..3e3dcba181 100644
--- a/src/lib/hooks/tests/callout_handle_unittest.cc
+++ b/src/lib/hooks/tests/callout_handle_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 <hooks/callout_handle.h>
#include <hooks/callout_manager.h>
#include <hooks/library_handle.h>
diff --git a/src/lib/hooks/tests/callout_manager_unittest.cc b/src/lib/hooks/tests/callout_manager_unittest.cc
index 03da266ab2..ae336aa4f9 100644
--- a/src/lib/hooks/tests/callout_manager_unittest.cc
+++ b/src/lib/hooks/tests/callout_manager_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/callout_handle.h>
#include <hooks/callout_manager.h>
diff --git a/src/lib/hooks/tests/handles_unittest.cc b/src/lib/hooks/tests/handles_unittest.cc
index de742e5ba3..036ed03a1e 100644
--- a/src/lib/hooks/tests/handles_unittest.cc
+++ b/src/lib/hooks/tests/handles_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 <hooks/callout_handle.h>
#include <hooks/callout_manager.h>
#include <hooks/library_handle.h>
diff --git a/src/lib/hooks/tests/hooks_manager_unittest.cc b/src/lib/hooks/tests/hooks_manager_unittest.cc
index 55e8138b9d..2a54fc14e3 100644
--- a/src/lib/hooks/tests/hooks_manager_unittest.cc
+++ b/src/lib/hooks/tests/hooks_manager_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 <hooks/callout_handle.h>
#include <hooks/hooks_manager.h>
#include <hooks/server_hooks.h>
diff --git a/src/lib/hooks/tests/library_manager_collection_unittest.cc b/src/lib/hooks/tests/library_manager_collection_unittest.cc
index 3325b17f21..6ace663abd 100644
--- a/src/lib/hooks/tests/library_manager_collection_unittest.cc
+++ b/src/lib/hooks/tests/library_manager_collection_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 <hooks/callout_handle.h>
#include <hooks/callout_manager.h>
#include <hooks/library_manager.h>
diff --git a/src/lib/hooks/tests/library_manager_unittest.cc b/src/lib/hooks/tests/library_manager_unittest.cc
index b97e514638..07202b26d4 100644
--- a/src/lib/hooks/tests/library_manager_unittest.cc
+++ b/src/lib/hooks/tests/library_manager_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 <hooks/callout_handle.h>
#include <hooks/callout_manager.h>
#include <hooks/library_manager.h>
diff --git a/src/lib/hooks/tests/run_unittests.cc b/src/lib/hooks/tests/run_unittests.cc
index 75b4454cf8..cd6fc2bf31 100644
--- a/src/lib/hooks/tests/run_unittests.cc
+++ b/src/lib/hooks/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 <util/unittests/run_all.h>
diff --git a/src/lib/hooks/tests/server_hooks_unittest.cc b/src/lib/hooks/tests/server_hooks_unittest.cc
index 6dd6e38d0f..3b5eb25b9b 100644
--- a/src/lib/hooks/tests/server_hooks_unittest.cc
+++ b/src/lib/hooks/tests/server_hooks_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 <hooks/server_hooks.h>
#include <gtest/gtest.h>
diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index f276564f34..d99ce00475 100644
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -DTOP_BUILDDIR=\"$(abs_top_builddir)\"
+AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
CLEANFILES = *.gcno *.gcda
lib_LTLIBRARIES = libkea-log.la
diff --git a/src/lib/log/buffer_appender_impl.cc b/src/lib/log/buffer_appender_impl.cc
index 6c287cdbe5..6ce8d402af 100644
--- a/src/lib/log/buffer_appender_impl.cc
+++ b/src/lib/log/buffer_appender_impl.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/buffer_appender_impl.h>
#include <log4cplus/loglevel.h>
diff --git a/src/lib/log/compiler/message.cc b/src/lib/log/compiler/message.cc
index ac28eced5f..8b7138813a 100644
--- a/src/lib/log/compiler/message.cc
+++ b/src/lib/log/compiler/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 <cctype>
#include <cstddef>
#include <fstream>
@@ -35,8 +37,6 @@ using namespace std;
using namespace isc::log;
using namespace isc::util;
-static const char* VERSION = "1.0-0";
-
/// \file log/compiler/message.cc
/// \brief Message Compiler
///
diff --git a/src/lib/log/interprocess/interprocess_sync_file.cc b/src/lib/log/interprocess/interprocess_sync_file.cc
index 85733c5691..ed6a5b7e2f 100644
--- a/src/lib/log/interprocess/interprocess_sync_file.cc
+++ b/src/lib/log/interprocess/interprocess_sync_file.cc
@@ -7,6 +7,8 @@
// This file requires LOCKFILE_DIR to be defined. It points to the default
// directory where lockfile will be created.
+#include <config.h>
+
#include <log/interprocess/interprocess_sync_file.h>
#include <string>
diff --git a/src/lib/log/interprocess/interprocess_sync_null.cc b/src/lib/log/interprocess/interprocess_sync_null.cc
index 55f9a00d58..ccd9e32a7c 100644
--- a/src/lib/log/interprocess/interprocess_sync_null.cc
+++ b/src/lib/log/interprocess/interprocess_sync_null.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/interprocess/interprocess_sync_null.h>
namespace isc {
diff --git a/src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc b/src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc
index 485680e068..4f12e37511 100644
--- a/src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc
+++ b/src/lib/log/interprocess/tests/interprocess_sync_null_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 <log/interprocess/interprocess_sync_null.h>
#include <gtest/gtest.h>
diff --git a/src/lib/log/interprocess/tests/run_unittests.cc b/src/lib/log/interprocess/tests/run_unittests.cc
index e389428338..0a12720b33 100644
--- a/src/lib/log/interprocess/tests/run_unittests.cc
+++ b/src/lib/log/interprocess/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
#include <stdlib.h>
diff --git a/src/lib/log/log_messages.cc b/src/lib/log/log_messages.cc
index e1f005cd90..34db41d967 100644
--- a/src/lib/log/log_messages.cc
+++ b/src/lib/log/log_messages.cc
@@ -1,5 +1,7 @@
// File created from log_messages.mes on Tue Jan 24 2017 20:17
+#include <config.h>
+
#include <cstddef>
#include <log/message_types.h>
#include <log/message_initializer.h>
diff --git a/src/lib/log/logger.cc b/src/lib/log/logger.cc
index a545d5d4ef..ab4f0bc555 100644
--- a/src/lib/log/logger.cc
+++ b/src/lib/log/logger.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 <stdarg.h>
#include <stdio.h>
diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc
index edcac1efc2..c4c594eea5 100644
--- a/src/lib/log/logger_impl.cc
+++ b/src/lib/log/logger_impl.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 <iostream>
#include <iomanip>
#include <algorithm>
diff --git a/src/lib/log/logger_level.cc b/src/lib/log/logger_level.cc
index 00b185fb15..195d60084d 100644
--- a/src/lib/log/logger_level.cc
+++ b/src/lib/log/logger_level.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_level.h>
#include <log/macros.h>
#include <log/log_messages.h>
diff --git a/src/lib/log/logger_level_impl.cc b/src/lib/log/logger_level_impl.cc
index 79ca4856f2..fd0dca5a53 100644
--- a/src/lib/log/logger_level_impl.cc
+++ b/src/lib/log/logger_level_impl.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 <algorithm>
#include <string.h>
#include <iostream>
diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc
index c1b81cac42..5d34b0915f 100644
--- a/src/lib/log/logger_manager.cc
+++ b/src/lib/log/logger_manager.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 <algorithm>
#include <vector>
diff --git a/src/lib/log/logger_name.cc b/src/lib/log/logger_name.cc
index eb502aefd7..39a79cc957 100644
--- a/src/lib/log/logger_name.cc
+++ b/src/lib/log/logger_name.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 <string>
#include <log/logger_name.h>
diff --git a/src/lib/log/logger_support.cc b/src/lib/log/logger_support.cc
index c8c9c353d5..9431edd20e 100644
--- a/src/lib/log/logger_support.cc
+++ b/src/lib/log/logger_support.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 <string>
#include <log/logger_support.h>
#include <log/logger_manager.h>
diff --git a/src/lib/log/logger_unittest_support.cc b/src/lib/log/logger_unittest_support.cc
index 59fe8e04b7..58dbef8c0e 100644
--- a/src/lib/log/logger_unittest_support.cc
+++ b/src/lib/log/logger_unittest_support.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 <iostream>
#include <algorithm>
#include <string>
diff --git a/src/lib/log/logimpl_messages.cc b/src/lib/log/logimpl_messages.cc
index ca8552e9ed..cf1b8e6584 100644
--- a/src/lib/log/logimpl_messages.cc
+++ b/src/lib/log/logimpl_messages.cc
@@ -1,5 +1,7 @@
// File created from logimpl_messages.mes on Wed Jun 22 10:57:02 2011
+#include <config.h>
+
#include <cstddef>
#include <log/message_types.h>
#include <log/message_initializer.h>
diff --git a/src/lib/log/message_dictionary.cc b/src/lib/log/message_dictionary.cc
index 892417ab6d..12511b0607 100644
--- a/src/lib/log/message_dictionary.cc
+++ b/src/lib/log/message_dictionary.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 <cstddef>
#include <log/message_dictionary.h>
#include <log/message_types.h>
diff --git a/src/lib/log/message_initializer.cc b/src/lib/log/message_initializer.cc
index cbe55e9926..a7c85ed2e6 100644
--- a/src/lib/log/message_initializer.cc
+++ b/src/lib/log/message_initializer.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/message_dictionary.h>
#include <log/message_initializer.h>
#include <algorithm>
diff --git a/src/lib/log/message_reader.cc b/src/lib/log/message_reader.cc
index 55cf5423dd..9159304582 100644
--- a/src/lib/log/message_reader.cc
+++ b/src/lib/log/message_reader.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 <cassert>
#include <errno.h>
#include <string.h>
diff --git a/src/lib/log/output_option.cc b/src/lib/log/output_option.cc
index 3ffaa0da88..f1ec538354 100644
--- a/src/lib/log/output_option.cc
+++ b/src/lib/log/output_option.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 <string>
#include <boost/algorithm/string.hpp>
diff --git a/src/lib/log/tests/buffer_logger_test.cc b/src/lib/log/tests/buffer_logger_test.cc
index 0855a0f883..956e2f1d71 100644
--- a/src/lib/log/tests/buffer_logger_test.cc
+++ b/src/lib/log/tests/buffer_logger_test.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/macros.h>
#include <log/logger_support.h>
#include <log/logger_manager.h>
diff --git a/src/lib/log/tests/init_logger_test.cc b/src/lib/log/tests/init_logger_test.cc
index 8cc64f475c..02862fd10a 100644
--- a/src/lib/log/tests/init_logger_test.cc
+++ b/src/lib/log/tests/init_logger_test.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/macros.h>
#include <log/logger_support.h>
#include <log/log_messages.h>
diff --git a/src/lib/log/tests/logger_example.cc b/src/lib/log/tests/logger_example.cc
index 66d5921bbd..dd1e8bcbf0 100644
--- a/src/lib/log/tests/logger_example.cc
+++ b/src/lib/log/tests/logger_example.cc
@@ -12,6 +12,8 @@
///
/// See the usage() method for details of use.
+#include <config.h>
+
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/lib/log/tests/logger_level_impl_unittest.cc b/src/lib/log/tests/logger_level_impl_unittest.cc
index 5246032072..c82be69b17 100644
--- a/src/lib/log/tests/logger_level_impl_unittest.cc
+++ b/src/lib/log/tests/logger_level_impl_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 <iostream>
#include <string>
diff --git a/src/lib/log/tests/logger_level_unittest.cc b/src/lib/log/tests/logger_level_unittest.cc
index b7d0af5580..ccaecd9015 100644
--- a/src/lib/log/tests/logger_level_unittest.cc
+++ b/src/lib/log/tests/logger_level_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 <iostream>
#include <string>
diff --git a/src/lib/log/tests/logger_lock_test.cc b/src/lib/log/tests/logger_lock_test.cc
index bbef11c87e..cb044c8d0b 100644
--- a/src/lib/log/tests/logger_lock_test.cc
+++ b/src/lib/log/tests/logger_lock_test.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/macros.h>
#include <log/logger_support.h>
#include <log/logger_manager.h>
diff --git a/src/lib/log/tests/logger_manager_unittest.cc b/src/lib/log/tests/logger_manager_unittest.cc
index 928a038709..5f7ed9a0c9 100644
--- a/src/lib/log/tests/logger_manager_unittest.cc
+++ b/src/lib/log/tests/logger_manager_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 <stdio.h>
#include <unistd.h>
diff --git a/src/lib/log/tests/logger_name_unittest.cc b/src/lib/log/tests/logger_name_unittest.cc
index a939f6c4bd..9048bf2662 100644
--- a/src/lib/log/tests/logger_name_unittest.cc
+++ b/src/lib/log/tests/logger_name_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 <string>
#include <gtest/gtest.h>
diff --git a/src/lib/log/tests/logger_specification_unittest.cc b/src/lib/log/tests/logger_specification_unittest.cc
index f3aade1a9e..be9da6e168 100644
--- a/src/lib/log/tests/logger_specification_unittest.cc
+++ b/src/lib/log/tests/logger_specification_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 <string>
#include <gtest/gtest.h>
diff --git a/src/lib/log/tests/logger_support_unittest.cc b/src/lib/log/tests/logger_support_unittest.cc
index 9b249ed4b0..3f2943c6a4 100644
--- a/src/lib/log/tests/logger_support_unittest.cc
+++ b/src/lib/log/tests/logger_support_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 <log/logger_support.h>
#include <log/log_messages.h>
diff --git a/src/lib/log/tests/message_dictionary_unittest.cc b/src/lib/log/tests/message_dictionary_unittest.cc
index eb5804f6d2..8613393bd1 100644
--- a/src/lib/log/tests/message_dictionary_unittest.cc
+++ b/src/lib/log/tests/message_dictionary_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 <cstddef>
#include <string>
#include <gtest/gtest.h>
diff --git a/src/lib/log/tests/message_initializer_1_unittest.cc b/src/lib/log/tests/message_initializer_1_unittest.cc
index cb28cf2361..3c58911bef 100644
--- a/src/lib/log/tests/message_initializer_1_unittest.cc
+++ b/src/lib/log/tests/message_initializer_1_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 <log/message_dictionary.h>
#include <log/message_initializer.h>
#include <boost/lexical_cast.hpp>
diff --git a/src/lib/log/tests/message_initializer_1a_unittest.cc b/src/lib/log/tests/message_initializer_1a_unittest.cc
index aaeef15690..3e2b86b39c 100644
--- a/src/lib/log/tests/message_initializer_1a_unittest.cc
+++ b/src/lib/log/tests/message_initializer_1a_unittest.cc
@@ -9,6 +9,8 @@
// checked. This tests that merely declaring the MessageInitializer object
// is enough to include the definitions in the global dictionary.
+#include <config.h>
+
#include <log/message_initializer.h>
using namespace isc::log;
diff --git a/src/lib/log/tests/message_reader_unittest.cc b/src/lib/log/tests/message_reader_unittest.cc
index 0f3bb0b819..72273da4b0 100644
--- a/src/lib/log/tests/message_reader_unittest.cc
+++ b/src/lib/log/tests/message_reader_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 <algorithm>
#include <string>
#include <gtest/gtest.h>
diff --git a/src/lib/log/tests/output_option_unittest.cc b/src/lib/log/tests/output_option_unittest.cc
index d4557f4c51..bf922a96ec 100644
--- a/src/lib/log/tests/output_option_unittest.cc
+++ b/src/lib/log/tests/output_option_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 <string>
#include <gtest/gtest.h>
diff --git a/src/lib/log/tests/run_initializer_unittests.cc b/src/lib/log/tests/run_initializer_unittests.cc
index 506b327b88..7765c14745 100644
--- a/src/lib/log/tests/run_initializer_unittests.cc
+++ b/src/lib/log/tests/run_initializer_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 <stdlib.h>
#include <gtest/gtest.h>
#include <util/unittests/run_all.h>
diff --git a/src/lib/log/tests/run_unittests.cc b/src/lib/log/tests/run_unittests.cc
index 3b75434bcc..2753b0ba0d 100644
--- a/src/lib/log/tests/run_unittests.cc
+++ b/src/lib/log/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 <stdlib.h>
#include <gtest/gtest.h>
#include <util/unittests/run_all.h>
diff --git a/src/lib/process/d_log.cc b/src/lib/process/d_log.cc
index f3a2df5ba2..a44999605b 100644
--- a/src/lib/process/d_log.cc
+++ b/src/lib/process/d_log.cc
@@ -6,6 +6,8 @@
/// Defines the logger used by the top-level component of kea-dhcp-ddns.
+#include <config.h>
+
#include <process/d_log.h>
namespace isc {
diff --git a/src/lib/process/io_service_signal.cc b/src/lib/process/io_service_signal.cc
index e8416e4dbe..31a9578da6 100644
--- a/src/lib/process/io_service_signal.cc
+++ b/src/lib/process/io_service_signal.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/interval_timer.h>
#include <process/d_log.h>
#include <process/io_service_signal.h>
diff --git a/src/lib/process/tests/run_unittests.cc b/src/lib/process/tests/run_unittests.cc
index e970ed5d68..a7c1f68dce 100644
--- a/src/lib/process/tests/run_unittests.cc
+++ b/src/lib/process/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 <process/d_log.h>
#include <gtest/gtest.h>
diff --git a/src/lib/stats/context.cc b/src/lib/stats/context.cc
index 3dc3473679..73daf10189 100644
--- a/src/lib/stats/context.cc
+++ b/src/lib/stats/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 <stats/context.h>
#include <map>
diff --git a/src/lib/stats/observation.cc b/src/lib/stats/observation.cc
index d86c039cd5..61155bae12 100644
--- a/src/lib/stats/observation.cc
+++ b/src/lib/stats/observation.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 <stats/observation.h>
#include <util/boost_time_utils.h>
#include <cc/data.h>
diff --git a/src/lib/stats/stats_mgr.cc b/src/lib/stats/stats_mgr.cc
index af8aafaf5c..feeee1287b 100644
--- a/src/lib/stats/stats_mgr.cc
+++ b/src/lib/stats/stats_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 <exceptions/exceptions.h>
#include <stats/stats_mgr.h>
#include <cc/data.h>
diff --git a/src/lib/stats/tests/run_unittests.cc b/src/lib/stats/tests/run_unittests.cc
index 2f54b37ce2..9d621ae1fa 100644
--- a/src/lib/stats/tests/run_unittests.cc
+++ b/src/lib/stats/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 <gtest/gtest.h>
int
diff --git a/src/lib/testutils/io_utils.cc b/src/lib/testutils/io_utils.cc
index 0081707e97..5590c690df 100644
--- a/src/lib/testutils/io_utils.cc
+++ b/src/lib/testutils/io_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 <exceptions/exceptions.h>
#include <testutils/io_utils.h>
#include <gtest/gtest.h>
diff --git a/src/lib/testutils/log_utils.cc b/src/lib/testutils/log_utils.cc
index 669d91e01d..33fffd1ea0 100644
--- a/src/lib/testutils/log_utils.cc
+++ b/src/lib/testutils/log_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 <testutils/log_utils.h>
#include <iostream>
diff --git a/src/lib/testutils/unix_control_client.cc b/src/lib/testutils/unix_control_client.cc
index faae202b6e..439f17bf6a 100644
--- a/src/lib/testutils/unix_control_client.cc
+++ b/src/lib/testutils/unix_control_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 <gtest/gtest.h>
#include <testutils/unix_control_client.h>
#include <unistd.h>
diff --git a/src/lib/util/boost_time_utils.cc b/src/lib/util/boost_time_utils.cc
index 442124acbe..8c5ab0848e 100644
--- a/src/lib/util/boost_time_utils.cc
+++ b/src/lib/util/boost_time_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 <util/boost_time_utils.h>
#include <sstream>
#include <iomanip>
diff --git a/src/lib/util/csv_file.cc b/src/lib/util/csv_file.cc
index 4c746e2f3a..023b6fdb76 100644
--- a/src/lib/util/csv_file.cc
+++ b/src/lib/util/csv_file.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 <util/csv_file.h>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/constants.hpp>
diff --git a/src/lib/util/encode/base_n.cc b/src/lib/util/encode/base_n.cc
index 87f60c4198..5a78e882cd 100644
--- a/src/lib/util/encode/base_n.cc
+++ b/src/lib/util/encode/base_n.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 <util/encode/base32hex_from_binary.h>
#include <util/encode/binary_from_base32hex.h>
#include <util/encode/base16_from_binary.h>
diff --git a/src/lib/util/filename.cc b/src/lib/util/filename.cc
index 85277c1700..709501019f 100644
--- a/src/lib/util/filename.cc
+++ b/src/lib/util/filename.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 <iostream>
#include <algorithm>
#include <string>
diff --git a/src/lib/util/io/fd.cc b/src/lib/util/io/fd.cc
index f04a107090..9d89485d15 100644
--- a/src/lib/util/io/fd.cc
+++ b/src/lib/util/io/fd.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 <util/io/fd.h>
#include <unistd.h>
diff --git a/src/lib/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index 40a2796073..ff33479647 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.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 <cstring>
#include <cstdlib>
diff --git a/src/lib/util/labeled_value.cc b/src/lib/util/labeled_value.cc
index 137c639e0c..cf0fc6d940 100644
--- a/src/lib/util/labeled_value.cc
+++ b/src/lib/util/labeled_value.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 <util/labeled_value.h>
namespace isc {
diff --git a/src/lib/util/memory_segment_local.cc b/src/lib/util/memory_segment_local.cc
index b0ac0869ab..2331e4b7c8 100644
--- a/src/lib/util/memory_segment_local.cc
+++ b/src/lib/util/memory_segment_local.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 <util/memory_segment_local.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/util/pid_file.cc b/src/lib/util/pid_file.cc
index a53bd3718a..ef519b3d87 100644
--- a/src/lib/util/pid_file.cc
+++ b/src/lib/util/pid_file.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 <util/pid_file.h>
#include <cstdio>
#include <signal.h>
diff --git a/src/lib/util/process_spawn.cc b/src/lib/util/process_spawn.cc
index a1ad445ef6..a762038bde 100644
--- a/src/lib/util/process_spawn.cc
+++ b/src/lib/util/process_spawn.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 <util/process_spawn.h>
#include <util/signal_set.h>
diff --git a/src/lib/util/random/qid_gen.cc b/src/lib/util/random/qid_gen.cc
index 0459050d5e..a635c1818a 100644
--- a/src/lib/util/random/qid_gen.cc
+++ b/src/lib/util/random/qid_gen.cc
@@ -10,6 +10,8 @@
// (and other parts where we need randomness, perhaps another thing
// for a general libutil?)
+#include <config.h>
+
#include <util/random/qid_gen.h>
#include <sys/time.h>
diff --git a/src/lib/util/signal_set.cc b/src/lib/util/signal_set.cc
index ba1b1b693c..b42a8e0927 100644
--- a/src/lib/util/signal_set.cc
+++ b/src/lib/util/signal_set.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 <util/signal_set.h>
#include <cerrno>
diff --git a/src/lib/util/stopwatch.cc b/src/lib/util/stopwatch.cc
index 8a3f6720fc..f75c6cdf4c 100644
--- a/src/lib/util/stopwatch.cc
+++ b/src/lib/util/stopwatch.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 <util/stopwatch.h>
#include <util/stopwatch_impl.h>
diff --git a/src/lib/util/stopwatch_impl.cc b/src/lib/util/stopwatch_impl.cc
index b19b7fe282..8f6bc653dd 100644
--- a/src/lib/util/stopwatch_impl.cc
+++ b/src/lib/util/stopwatch_impl.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 <util/stopwatch_impl.h>
#include <iomanip>
#include <sstream>
diff --git a/src/lib/util/strutil.cc b/src/lib/util/strutil.cc
index b3f576be95..63197eb7bb 100644
--- a/src/lib/util/strutil.cc
+++ b/src/lib/util/strutil.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 <util/encode/hex.h>
#include <util/strutil.h>
diff --git a/src/lib/util/tests/base32hex_unittest.cc b/src/lib/util/tests/base32hex_unittest.cc
index 7011c05acb..bf28f6295e 100644
--- a/src/lib/util/tests/base32hex_unittest.cc
+++ b/src/lib/util/tests/base32hex_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 <cctype>
diff --git a/src/lib/util/tests/base64_unittest.cc b/src/lib/util/tests/base64_unittest.cc
index 8952c886a9..516925e539 100644
--- a/src/lib/util/tests/base64_unittest.cc
+++ b/src/lib/util/tests/base64_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 <string>
#include <utility>
#include <vector>
diff --git a/src/lib/util/tests/filename_unittest.cc b/src/lib/util/tests/filename_unittest.cc
index 1421ed7986..39ff1f9570 100644
--- a/src/lib/util/tests/filename_unittest.cc
+++ b/src/lib/util/tests/filename_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 <string>
#include <gtest/gtest.h>
diff --git a/src/lib/util/tests/hex_unittest.cc b/src/lib/util/tests/hex_unittest.cc
index 150ad5a990..1e611b51a3 100644
--- a/src/lib/util/tests/hex_unittest.cc
+++ b/src/lib/util/tests/hex_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 <vector>
diff --git a/src/lib/util/tests/io_utilities_unittest.cc b/src/lib/util/tests/io_utilities_unittest.cc
index 4d9efdb294..4d9bbec742 100644
--- a/src/lib/util/tests/io_utilities_unittest.cc
+++ b/src/lib/util/tests/io_utilities_unittest.cc
@@ -9,6 +9,8 @@
/// Tests the functionality of the asiolink utilities code by comparing them
/// with the equivalent methods in isc::dns::[Input/Output]Buffer.
+#include <config.h>
+
#include <cstddef>
#include <arpa/inet.h>
diff --git a/src/lib/util/tests/labeled_value_unittest.cc b/src/lib/util/tests/labeled_value_unittest.cc
index 5ef6af59d0..c994156e3f 100644
--- a/src/lib/util/tests/labeled_value_unittest.cc
+++ b/src/lib/util/tests/labeled_value_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 <util/labeled_value.h>
#include <gtest/gtest.h>
diff --git a/src/lib/util/tests/memory_segment_common_unittest.cc b/src/lib/util/tests/memory_segment_common_unittest.cc
index 3263f829a2..f95021d3b5 100644
--- a/src/lib/util/tests/memory_segment_common_unittest.cc
+++ b/src/lib/util/tests/memory_segment_common_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 <util/memory_segment.h>
#include <exceptions/exceptions.h>
diff --git a/src/lib/util/tests/memory_segment_local_unittest.cc b/src/lib/util/tests/memory_segment_local_unittest.cc
index 6a900bcfa2..d1aa52d320 100644
--- a/src/lib/util/tests/memory_segment_local_unittest.cc
+++ b/src/lib/util/tests/memory_segment_local_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 <util/tests/memory_segment_common_unittest.h>
#include <util/memory_segment_local.h>
diff --git a/src/lib/util/tests/pid_file_unittest.cc b/src/lib/util/tests/pid_file_unittest.cc
index d837a21dc7..08b1881eb7 100644
--- a/src/lib/util/tests/pid_file_unittest.cc
+++ b/src/lib/util/tests/pid_file_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 <util/pid_file.h>
#include <gtest/gtest.h>
#include <fstream>
diff --git a/src/lib/util/tests/process_spawn_unittest.cc b/src/lib/util/tests/process_spawn_unittest.cc
index 6035a2f606..016fbbebcb 100644
--- a/src/lib/util/tests/process_spawn_unittest.cc
+++ b/src/lib/util/tests/process_spawn_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 <util/process_spawn.h>
#include <gtest/gtest.h>
#include <signal.h>
diff --git a/src/lib/util/tests/qid_gen_unittest.cc b/src/lib/util/tests/qid_gen_unittest.cc
index f3c6a59745..5042283b90 100644
--- a/src/lib/util/tests/qid_gen_unittest.cc
+++ b/src/lib/util/tests/qid_gen_unittest.cc
@@ -14,6 +14,8 @@
/// \brief Test of QidGenerator
///
+#include <config.h>
+
#include <gtest/gtest.h>
#include <util/random/qid_gen.h>
diff --git a/src/lib/util/tests/run_unittests.cc b/src/lib/util/tests/run_unittests.cc
index 5ea0a8a28b..ef2a372ddc 100644
--- a/src/lib/util/tests/run_unittests.cc
+++ b/src/lib/util/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
#include <stdlib.h>
diff --git a/src/lib/util/tests/signal_set_unittest.cc b/src/lib/util/tests/signal_set_unittest.cc
index 1cc5620d86..b11cf917ac 100644
--- a/src/lib/util/tests/signal_set_unittest.cc
+++ b/src/lib/util/tests/signal_set_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 <util/signal_set.h>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/src/lib/util/tests/stopwatch_unittest.cc b/src/lib/util/tests/stopwatch_unittest.cc
index d66254e3b7..10abef2052 100644
--- a/src/lib/util/tests/stopwatch_unittest.cc
+++ b/src/lib/util/tests/stopwatch_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 <util/stopwatch.h>
#include <util/stopwatch_impl.h>
#include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/src/lib/util/tests/strutil_unittest.cc b/src/lib/util/tests/strutil_unittest.cc
index 7176e74c9d..e518acb8fe 100644
--- a/src/lib/util/tests/strutil_unittest.cc
+++ b/src/lib/util/tests/strutil_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 <util/strutil.h>
#include <util/encode/hex.h>
diff --git a/src/lib/util/tests/time_utilities_unittest.cc b/src/lib/util/tests/time_utilities_unittest.cc
index 7d1cc4fe2b..1637a7a19e 100644
--- a/src/lib/util/tests/time_utilities_unittest.cc
+++ b/src/lib/util/tests/time_utilities_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 <string>
#include <time.h>
diff --git a/src/lib/util/threads/tests/run_unittests.cc b/src/lib/util/threads/tests/run_unittests.cc
index 2e1b80164b..d55ce68c6e 100644
--- a/src/lib/util/threads/tests/run_unittests.cc
+++ b/src/lib/util/threads/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 <gtest/gtest.h>
#include <util/unittests/run_all.h>
#include <stdlib.h>
diff --git a/src/lib/util/time_utilities.cc b/src/lib/util/time_utilities.cc
index d97f3be0a7..5da1db757e 100644
--- a/src/lib/util/time_utilities.cc
+++ b/src/lib/util/time_utilities.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 <sys/time.h>
diff --git a/src/lib/util/unittests/fork.cc b/src/lib/util/unittests/fork.cc
index 058eb32d81..fc8b525bda 100644
--- a/src/lib/util/unittests/fork.cc
+++ b/src/lib/util/unittests/fork.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 <util/unittests/fork.h>
#include <util/io/fd.h>
diff --git a/src/lib/util/unittests/interprocess_util.cc b/src/lib/util/unittests/interprocess_util.cc
index b50603a307..dd639ffa59 100644
--- a/src/lib/util/unittests/interprocess_util.cc
+++ b/src/lib/util/unittests/interprocess_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 <gtest/gtest.h>
#include <sys/select.h>
diff --git a/src/lib/util/unittests/newhook.cc b/src/lib/util/unittests/newhook.cc
index 09686d43ce..16c601a8a8 100644
--- a/src/lib/util/unittests/newhook.cc
+++ b/src/lib/util/unittests/newhook.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 <stdlib.h>
#include <new>
diff --git a/src/lib/util/unittests/resource.cc b/src/lib/util/unittests/resource.cc
index 55788cab88..b4a33b3527 100644
--- a/src/lib/util/unittests/resource.cc
+++ b/src/lib/util/unittests/resource.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 <util/unittests/resource.h>
#include <gtest/gtest.h>
diff --git a/src/lib/util/unittests/run_all.cc b/src/lib/util/unittests/run_all.cc
index c965fec6d5..82542ca90b 100644
--- a/src/lib/util/unittests/run_all.cc
+++ b/src/lib/util/unittests/run_all.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 <stdlib.h>
#include <iostream>
diff --git a/src/lib/util/unittests/testdata.cc b/src/lib/util/unittests/testdata.cc
index 7dbb4ff11f..e3ecc916db 100644
--- a/src/lib/util/unittests/testdata.cc
+++ b/src/lib/util/unittests/testdata.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 <string>
#include <stdexcept>
#include <fstream>
diff --git a/src/lib/util/unittests/wiredata.cc b/src/lib/util/unittests/wiredata.cc
index 9e7487ac69..c14c8f164d 100644
--- a/src/lib/util/unittests/wiredata.cc
+++ b/src/lib/util/unittests/wiredata.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 <util/unittests/wiredata.h>
#include <gtest/gtest.h>
diff --git a/src/lib/util/versioned_csv_file.cc b/src/lib/util/versioned_csv_file.cc
index fc03b55126..b886198d6c 100644
--- a/src/lib/util/versioned_csv_file.cc
+++ b/src/lib/util/versioned_csv_file.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 <util/versioned_csv_file.h>
namespace isc {
diff --git a/src/lib/util/watch_socket.cc b/src/lib/util/watch_socket.cc
index a5b7b02887..b78fdf6312 100644
--- a/src/lib/util/watch_socket.cc
+++ b/src/lib/util/watch_socket.cc
@@ -6,6 +6,8 @@
/// @file watch_socket.cc
+#include <config.h>
+
//#include <dhcp_ddns/dhcp_ddns_log.h>
#include <util/watch_socket.h>