From: Francis Dupont <fdupont@isc.org>
Date: Fri, 20 Oct 2017 11:54:53 +0000 (+0200)
Subject: [5372] Revert "[5372] Added xxx_messages.h generated files"
X-Git-Tag: trac5266_base~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d78458116e8e26b430f195ec587256e3f13c827b;p=thirdparty%2Fkea.git

[5372] Revert "[5372] Added xxx_messages.h generated files"

This reverts commit e5fd505f36125298e8fccf60ba34a156ee2979d9
which does not work as expected.
---

diff --git a/src/bin/agent/.gitignore b/src/bin/agent/.gitignore
index c75258dd09..c24184cb91 100644
--- a/src/bin/agent/.gitignore
+++ b/src/bin/agent/.gitignore
@@ -1,5 +1,6 @@
 /kea-ctrl-agent
 /ca_messages.cc
+/ca_messages.h
 /s-messages
 /kea-ctrl-agent.8
 
diff --git a/src/bin/agent/ca_messages.h b/src/bin/agent/ca_messages.h
deleted file mode 100644
index 5dc41b5b6b..0000000000
--- a/src/bin/agent/ca_messages.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// File created from ../../../src/bin/agent/ca_messages.mes on Fri Oct 20 2017 00:28
-
-#ifndef CA_MESSAGES_H
-#define CA_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace agent {
-
-extern const isc::log::MessageID CTRL_AGENT_COMMAND_FORWARDED;
-extern const isc::log::MessageID CTRL_AGENT_COMMAND_FORWARD_BEGIN;
-extern const isc::log::MessageID CTRL_AGENT_COMMAND_FORWARD_FAILED;
-extern const isc::log::MessageID CTRL_AGENT_CONFIG_CHECK_FAIL;
-extern const isc::log::MessageID CTRL_AGENT_CONFIG_FAIL;
-extern const isc::log::MessageID CTRL_AGENT_FAILED;
-extern const isc::log::MessageID CTRL_AGENT_HTTP_SERVICE_STARTED;
-extern const isc::log::MessageID CTRL_AGENT_RUN_EXIT;
-extern const isc::log::MessageID CTRL_AGENT_STARTED;
-
-} // namespace agent
-} // namespace isc
-
-#endif // CA_MESSAGES_H
diff --git a/src/bin/d2/.gitignore b/src/bin/d2/.gitignore
index e704caa5b6..06446ddf48 100644
--- a/src/bin/d2/.gitignore
+++ b/src/bin/d2/.gitignore
@@ -1,4 +1,5 @@
 /kea-dhcp-ddns
 /kea-dhcp-ddns.8
 /d2_messages.cc
+/d2_messages.h
 /s-messages
diff --git a/src/bin/d2/d2_messages.h b/src/bin/d2/d2_messages.h
deleted file mode 100644
index c36d3e5855..0000000000
--- a/src/bin/d2/d2_messages.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// File created from ../../../src/bin/d2/d2_messages.mes on Fri Oct 20 2017 00:28
-
-#ifndef D2_MESSAGES_H
-#define D2_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace d2 {
-
-extern const isc::log::MessageID DHCP_DDNS_ADD_FAILED;
-extern const isc::log::MessageID DHCP_DDNS_ADD_SUCCEEDED;
-extern const isc::log::MessageID DHCP_DDNS_ALREADY_RUNNING;
-extern const isc::log::MessageID DHCP_DDNS_AT_MAX_TRANSACTIONS;
-extern const isc::log::MessageID DHCP_DDNS_CLEARED_FOR_SHUTDOWN;
-extern const isc::log::MessageID DHCP_DDNS_COMMAND;
-extern const isc::log::MessageID DHCP_DDNS_CONFIGURE;
-extern const isc::log::MessageID DHCP_DDNS_FAILED;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_ADD_BAD_DNSCLIENT_STATUS;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_ADD_BUILD_FAILURE;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_ADD_IO_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_ADD_REJECTED;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_ADD_RESP_CORRUPT;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_ADDRS_BAD_DNSCLIENT_STATUS;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_ADDRS_BUILD_FAILURE;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_ADDRS_IO_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_ADDRS_REJECTED;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_ADDRS_RESP_CORRUPT;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_RRS_BAD_DNSCLIENT_STATUS;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_RRS_BUILD_FAILURE;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_RRS_IO_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_RRS_REJECTED;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REMOVE_RRS_RESP_CORRUPT;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REPLACE_BAD_DNSCLIENT_STATUS;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REPLACE_BUILD_FAILURE;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REPLACE_IO_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REPLACE_REJECTED;
-extern const isc::log::MessageID DHCP_DDNS_FORWARD_REPLACE_RESP_CORRUPT;
-extern const isc::log::MessageID DHCP_DDNS_FWD_REQUEST_IGNORED;
-extern const isc::log::MessageID DHCP_DDNS_INVALID_RESPONSE;
-extern const isc::log::MessageID DHCP_DDNS_NOT_ON_LOOPBACK;
-extern const isc::log::MessageID DHCP_DDNS_NO_ELIGIBLE_JOBS;
-extern const isc::log::MessageID DHCP_DDNS_NO_FWD_MATCH_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NO_MATCH;
-extern const isc::log::MessageID DHCP_DDNS_NO_REV_MATCH_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_PROCESS_INIT;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_QUEUE_FULL;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_QUEUE_RECEIVE;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_RECONFIGURING;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_RECOVERING;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_RECV_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_RESUME_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_RESUMING;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_STARTED;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_START_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_STOPPED;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_STOPPING;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_STOP_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_UNEXPECTED_HANDLER_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_UNEXPECTED_STOP;
-extern const isc::log::MessageID DHCP_DDNS_REMOVE_FAILED;
-extern const isc::log::MessageID DHCP_DDNS_REMOVE_SUCCEEDED;
-extern const isc::log::MessageID DHCP_DDNS_REQUEST_DROPPED;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REMOVE_BAD_DNSCLIENT_STATUS;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REMOVE_BUILD_FAILURE;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REMOVE_IO_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REMOVE_REJECTED;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REMOVE_RESP_CORRUPT;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REPLACE_BAD_DNSCLIENT_STATUS;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REPLACE_BUILD_FAILURE;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REPLACE_IO_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REPLACE_REJECTED;
-extern const isc::log::MessageID DHCP_DDNS_REVERSE_REPLACE_RESP_CORRUPT;
-extern const isc::log::MessageID DHCP_DDNS_REV_REQUEST_IGNORED;
-extern const isc::log::MessageID DHCP_DDNS_RUN_EXIT;
-extern const isc::log::MessageID DHCP_DDNS_SHUTDOWN_COMMAND;
-extern const isc::log::MessageID DHCP_DDNS_STARTED;
-extern const isc::log::MessageID DHCP_DDNS_STARTING_TRANSACTION;
-extern const isc::log::MessageID DHCP_DDNS_STATE_MODEL_UNEXPECTED_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_TRANS_SEND_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_UPDATE_REQUEST_SENT;
-extern const isc::log::MessageID DHCP_DDNS_UPDATE_RESPONSE_RECEIVED;
-
-} // namespace d2
-} // namespace isc
-
-#endif // D2_MESSAGES_H
diff --git a/src/bin/dhcp4/.gitignore b/src/bin/dhcp4/.gitignore
index 8f34cb0e95..817adfcd20 100644
--- a/src/bin/dhcp4/.gitignore
+++ b/src/bin/dhcp4/.gitignore
@@ -1,6 +1,7 @@
 /kea-dhcp4
 /kea-dhcp4.8
 /dhcp4_messages.cc
+/dhcp4_messages.h
 /spec_config.h
 /spec_config.h.pre
 /s-messages
diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h
deleted file mode 100644
index 620b697a47..0000000000
--- a/src/bin/dhcp4/dhcp4_messages.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Fri Oct 20 2017 00:26
-
-#ifndef DHCP4_MESSAGES_H
-#define DHCP4_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace dhcp {
-
-extern const isc::log::MessageID DHCP4_ACTIVATE_INTERFACE;
-extern const isc::log::MessageID DHCP4_ALREADY_RUNNING;
-extern const isc::log::MessageID DHCP4_BUFFER_RECEIVED;
-extern const isc::log::MessageID DHCP4_BUFFER_RECEIVE_FAIL;
-extern const isc::log::MessageID DHCP4_BUFFER_UNPACK;
-extern const isc::log::MessageID DHCP4_BUFFER_WAIT_SIGNAL;
-extern const isc::log::MessageID DHCP4_CLASS_ASSIGNED;
-extern const isc::log::MessageID DHCP4_CLASS_UNCONFIGURED;
-extern const isc::log::MessageID DHCP4_CLIENTID_IGNORED_FOR_LEASES;
-extern const isc::log::MessageID DHCP4_CLIENT_FQDN_DATA;
-extern const isc::log::MessageID DHCP4_CLIENT_FQDN_PROCESS;
-extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_DATA;
-extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_PROCESS;
-extern const isc::log::MessageID DHCP4_CLIENT_NAME_PROC_FAIL;
-extern const isc::log::MessageID DHCP4_COMMAND_RECEIVED;
-extern const isc::log::MessageID DHCP4_CONFIG_COMPLETE;
-extern const isc::log::MessageID DHCP4_CONFIG_LOAD_FAIL;
-extern const isc::log::MessageID DHCP4_CONFIG_NEW_SUBNET;
-extern const isc::log::MessageID DHCP4_CONFIG_OPTION_DUPLICATE;
-extern const isc::log::MessageID DHCP4_CONFIG_RECEIVED;
-extern const isc::log::MessageID DHCP4_CONFIG_START;
-extern const isc::log::MessageID DHCP4_CONFIG_UPDATE;
-extern const isc::log::MessageID DHCP4_DDNS_REQUEST_SEND_FAILED;
-extern const isc::log::MessageID DHCP4_DEACTIVATE_INTERFACE;
-extern const isc::log::MessageID DHCP4_DECLINE_LEASE;
-extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH;
-extern const isc::log::MessageID DHCP4_DECLINE_LEASE_NOT_FOUND;
-extern const isc::log::MessageID DHCP4_DHCP4O6_BAD_PACKET;
-extern const isc::log::MessageID DHCP4_DHCP4O6_PACKET_SEND;
-extern const isc::log::MessageID DHCP4_DHCP4O6_PACKET_SEND_FAIL;
-extern const isc::log::MessageID DHCP4_DHCP4O6_RECEIVE_FAIL;
-extern const isc::log::MessageID DHCP4_DHCP4O6_RECEIVING;
-extern const isc::log::MessageID DHCP4_DHCP4O6_RESPONSE_DATA;
-extern const isc::log::MessageID DHCP4_DYNAMIC_RECONFIGURATION;
-extern const isc::log::MessageID DHCP4_DYNAMIC_RECONFIGURATION_FAIL;
-extern const isc::log::MessageID DHCP4_EMPTY_HOSTNAME;
-extern const isc::log::MessageID DHCP4_FLEX_ID;
-extern const isc::log::MessageID DHCP4_GENERATE_FQDN;
-extern const isc::log::MessageID DHCP4_HANDLE_SIGNAL_EXCEPTION;
-extern const isc::log::MessageID DHCP4_HOOKS_LIBS_RELOAD_FAIL;
-extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_SKIP;
-extern const isc::log::MessageID DHCP4_HOOK_BUFFER_SEND_SKIP;
-extern const isc::log::MessageID DHCP4_HOOK_DECLINE_SKIP;
-extern const isc::log::MessageID DHCP4_HOOK_LEASE4_RELEASE_SKIP;
-extern const isc::log::MessageID DHCP4_HOOK_PACKET_RCVD_SKIP;
-extern const isc::log::MessageID DHCP4_HOOK_PACKET_SEND_SKIP;
-extern const isc::log::MessageID DHCP4_HOOK_SUBNET4_SELECT_SKIP;
-extern const isc::log::MessageID DHCP4_INFORM_DIRECT_REPLY;
-extern const isc::log::MessageID DHCP4_INIT_FAIL;
-extern const isc::log::MessageID DHCP4_INIT_REBOOT;
-extern const isc::log::MessageID DHCP4_LEASE_ADVERT;
-extern const isc::log::MessageID DHCP4_LEASE_ALLOC;
-extern const isc::log::MessageID DHCP4_NCR_CREATE;
-extern const isc::log::MessageID DHCP4_NCR_CREATION_FAILED;
-extern const isc::log::MessageID DHCP4_NOT_RUNNING;
-extern const isc::log::MessageID DHCP4_NO_LEASE_INIT_REBOOT;
-extern const isc::log::MessageID DHCP4_NO_SOCKETS_OPEN;
-extern const isc::log::MessageID DHCP4_OPEN_SOCKET;
-extern const isc::log::MessageID DHCP4_OPEN_SOCKET_FAIL;
-extern const isc::log::MessageID DHCP4_PACKET_DROP_0001;
-extern const isc::log::MessageID DHCP4_PACKET_DROP_0002;
-extern const isc::log::MessageID DHCP4_PACKET_DROP_0003;
-extern const isc::log::MessageID DHCP4_PACKET_DROP_0004;
-extern const isc::log::MessageID DHCP4_PACKET_DROP_0005;
-extern const isc::log::MessageID DHCP4_PACKET_DROP_0006;
-extern const isc::log::MessageID DHCP4_PACKET_DROP_0007;
-extern const isc::log::MessageID DHCP4_PACKET_NAK_0001;
-extern const isc::log::MessageID DHCP4_PACKET_NAK_0002;
-extern const isc::log::MessageID DHCP4_PACKET_NAK_0003;
-extern const isc::log::MessageID DHCP4_PACKET_NAK_0004;
-extern const isc::log::MessageID DHCP4_PACKET_PACK;
-extern const isc::log::MessageID DHCP4_PACKET_PACK_FAIL;
-extern const isc::log::MessageID DHCP4_PACKET_PROCESS_EXCEPTION;
-extern const isc::log::MessageID DHCP4_PACKET_PROCESS_STD_EXCEPTION;
-extern const isc::log::MessageID DHCP4_PACKET_RECEIVED;
-extern const isc::log::MessageID DHCP4_PACKET_SEND;
-extern const isc::log::MessageID DHCP4_PACKET_SEND_FAIL;
-extern const isc::log::MessageID DHCP4_PARSER_COMMIT_EXCEPTION;
-extern const isc::log::MessageID DHCP4_PARSER_COMMIT_FAIL;
-extern const isc::log::MessageID DHCP4_PARSER_EXCEPTION;
-extern const isc::log::MessageID DHCP4_PARSER_FAIL;
-extern const isc::log::MessageID DHCP4_POST_ALLOCATION_NAME_UPDATE_FAIL;
-extern const isc::log::MessageID DHCP4_QUERY_DATA;
-extern const isc::log::MessageID DHCP4_RELEASE;
-extern const isc::log::MessageID DHCP4_RELEASE_EXCEPTION;
-extern const isc::log::MessageID DHCP4_RELEASE_FAIL;
-extern const isc::log::MessageID DHCP4_RELEASE_FAIL_NO_LEASE;
-extern const isc::log::MessageID DHCP4_RELEASE_FAIL_WRONG_CLIENT;
-extern const isc::log::MessageID DHCP4_RESERVED_HOSTNAME_ASSIGNED;
-extern const isc::log::MessageID DHCP4_RESPONSE_DATA;
-extern const isc::log::MessageID DHCP4_RESPONSE_FQDN_DATA;
-extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_DATA;
-extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_GENERATE;
-extern const isc::log::MessageID DHCP4_SERVER_FAILED;
-extern const isc::log::MessageID DHCP4_SHUTDOWN;
-extern const isc::log::MessageID DHCP4_SHUTDOWN_REQUEST;
-extern const isc::log::MessageID DHCP4_SRV_CONSTRUCT_ERROR;
-extern const isc::log::MessageID DHCP4_SRV_D2STOP_ERROR;
-extern const isc::log::MessageID DHCP4_SRV_DHCP4O6_ERROR;
-extern const isc::log::MessageID DHCP4_STARTED;
-extern const isc::log::MessageID DHCP4_STARTING;
-extern const isc::log::MessageID DHCP4_START_INFO;
-extern const isc::log::MessageID DHCP4_SUBNET_DATA;
-extern const isc::log::MessageID DHCP4_SUBNET_DYNAMICALLY_CHANGED;
-extern const isc::log::MessageID DHCP4_SUBNET_SELECTED;
-extern const isc::log::MessageID DHCP4_SUBNET_SELECTION_FAILED;
-extern const isc::log::MessageID DHCP6_DHCP4O6_PACKET_RECEIVED;
-
-} // namespace dhcp
-} // namespace isc
-
-#endif // DHCP4_MESSAGES_H
diff --git a/src/bin/dhcp6/.gitignore b/src/bin/dhcp6/.gitignore
index 7ad9cfdbde..a0e877519b 100644
--- a/src/bin/dhcp6/.gitignore
+++ b/src/bin/dhcp6/.gitignore
@@ -1,6 +1,7 @@
 /kea-dhcp6
 /kea-dhcp6.8
 /dhcp6_messages.cc
+/dhcp6_messages.h
 /spec_config.h
 /spec_config.h.pre
 /s-messages
diff --git a/src/bin/dhcp6/dhcp6_messages.h b/src/bin/dhcp6/dhcp6_messages.h
deleted file mode 100644
index 1e1944d6c1..0000000000
--- a/src/bin/dhcp6/dhcp6_messages.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Fri Oct 20 2017 00:27
-
-#ifndef DHCP6_MESSAGES_H
-#define DHCP6_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace dhcp {
-
-extern const isc::log::MessageID DHCP6_ACTIVATE_INTERFACE;
-extern const isc::log::MessageID DHCP6_ADD_GLOBAL_STATUS_CODE;
-extern const isc::log::MessageID DHCP6_ADD_STATUS_CODE_FOR_IA;
-extern const isc::log::MessageID DHCP6_ALREADY_RUNNING;
-extern const isc::log::MessageID DHCP6_BUFFER_RECEIVED;
-extern const isc::log::MessageID DHCP6_BUFFER_UNPACK;
-extern const isc::log::MessageID DHCP6_BUFFER_WAIT_SIGNAL;
-extern const isc::log::MessageID DHCP6_CLASS_ASSIGNED;
-extern const isc::log::MessageID DHCP6_CLASS_UNCONFIGURED;
-extern const isc::log::MessageID DHCP6_COMMAND_RECEIVED;
-extern const isc::log::MessageID DHCP6_CONFIG_COMPLETE;
-extern const isc::log::MessageID DHCP6_CONFIG_LOAD_FAIL;
-extern const isc::log::MessageID DHCP6_CONFIG_RECEIVED;
-extern const isc::log::MessageID DHCP6_CONFIG_START;
-extern const isc::log::MessageID DHCP6_CONFIG_UPDATE;
-extern const isc::log::MessageID DHCP6_DB_BACKEND_STARTED;
-extern const isc::log::MessageID DHCP6_DDNS_CREATE_ADD_NAME_CHANGE_REQUEST;
-extern const isc::log::MessageID DHCP6_DDNS_FQDN_GENERATED;
-extern const isc::log::MessageID DHCP6_DDNS_GENERATED_FQDN_UPDATE_FAIL;
-extern const isc::log::MessageID DHCP6_DDNS_GENERATE_FQDN;
-extern const isc::log::MessageID DHCP6_DDNS_LEASE_RENEW_FQDN_CHANGE;
-extern const isc::log::MessageID DHCP6_DDNS_RECEIVE_FQDN;
-extern const isc::log::MessageID DHCP6_DDNS_REQUEST_SEND_FAILED;
-extern const isc::log::MessageID DHCP6_DDNS_RESPONSE_FQDN_DATA;
-extern const isc::log::MessageID DHCP6_DDNS_SEND_FQDN;
-extern const isc::log::MessageID DHCP6_DEACTIVATE_INTERFACE;
-extern const isc::log::MessageID DHCP6_DECLINE_FAIL_DUID_MISMATCH;
-extern const isc::log::MessageID DHCP6_DECLINE_FAIL_IAID_MISMATCH;
-extern const isc::log::MessageID DHCP6_DECLINE_FAIL_LEASE_WITHOUT_DUID;
-extern const isc::log::MessageID DHCP6_DECLINE_FAIL_NO_LEASE;
-extern const isc::log::MessageID DHCP6_DECLINE_LEASE;
-extern const isc::log::MessageID DHCP6_DECLINE_PROCESS_IA;
-extern const isc::log::MessageID DHCP6_DHCP4O6_PACKET_RECEIVED;
-extern const isc::log::MessageID DHCP6_DHCP4O6_RECEIVE_FAIL;
-extern const isc::log::MessageID DHCP6_DHCP4O6_RECEIVING;
-extern const isc::log::MessageID DHCP6_DHCP4O6_SEND_FAIL;
-extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION;
-extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION_FAIL;
-extern const isc::log::MessageID DHCP6_FLEX_ID;
-extern const isc::log::MessageID DHCP6_HANDLE_SIGNAL_EXCEPTION;
-extern const isc::log::MessageID DHCP6_HOOKS_LIBS_RELOAD_FAIL;
-extern const isc::log::MessageID DHCP6_HOOK_BUFFER_RCVD_SKIP;
-extern const isc::log::MessageID DHCP6_HOOK_BUFFER_SEND_SKIP;
-extern const isc::log::MessageID DHCP6_HOOK_DECLINE_DROP;
-extern const isc::log::MessageID DHCP6_HOOK_DECLINE_SKIP;
-extern const isc::log::MessageID DHCP6_HOOK_LEASE6_RELEASE_NA_SKIP;
-extern const isc::log::MessageID DHCP6_HOOK_LEASE6_RELEASE_PD_SKIP;
-extern const isc::log::MessageID DHCP6_HOOK_PACKET_RCVD_SKIP;
-extern const isc::log::MessageID DHCP6_HOOK_PACKET_SEND_SKIP;
-extern const isc::log::MessageID DHCP6_HOOK_SUBNET6_SELECT_SKIP;
-extern const isc::log::MessageID DHCP6_INIT_FAIL;
-extern const isc::log::MessageID DHCP6_LEASE_ADVERT;
-extern const isc::log::MessageID DHCP6_LEASE_ADVERT_FAIL;
-extern const isc::log::MessageID DHCP6_LEASE_ALLOC;
-extern const isc::log::MessageID DHCP6_LEASE_ALLOC_FAIL;
-extern const isc::log::MessageID DHCP6_LEASE_DATA;
-extern const isc::log::MessageID DHCP6_LEASE_NA_WITHOUT_DUID;
-extern const isc::log::MessageID DHCP6_LEASE_PD_WITHOUT_DUID;
-extern const isc::log::MessageID DHCP6_LEASE_RENEW;
-extern const isc::log::MessageID DHCP6_NOT_RUNNING;
-extern const isc::log::MessageID DHCP6_NO_INTERFACES;
-extern const isc::log::MessageID DHCP6_NO_SOCKETS_OPEN;
-extern const isc::log::MessageID DHCP6_OPEN_SOCKET;
-extern const isc::log::MessageID DHCP6_OPEN_SOCKET_FAIL;
-extern const isc::log::MessageID DHCP6_PACKET_DROP_PARSE_FAIL;
-extern const isc::log::MessageID DHCP6_PACKET_DROP_SERVERID_MISMATCH;
-extern const isc::log::MessageID DHCP6_PACKET_DROP_UNICAST;
-extern const isc::log::MessageID DHCP6_PACKET_PROCESS_EXCEPTION;
-extern const isc::log::MessageID DHCP6_PACKET_PROCESS_FAIL;
-extern const isc::log::MessageID DHCP6_PACKET_PROCESS_STD_EXCEPTION;
-extern const isc::log::MessageID DHCP6_PACKET_RECEIVED;
-extern const isc::log::MessageID DHCP6_PACKET_RECEIVE_FAIL;
-extern const isc::log::MessageID DHCP6_PACKET_SEND_FAIL;
-extern const isc::log::MessageID DHCP6_PACK_FAIL;
-extern const isc::log::MessageID DHCP6_PARSER_COMMIT_EXCEPTION;
-extern const isc::log::MessageID DHCP6_PARSER_COMMIT_FAIL;
-extern const isc::log::MessageID DHCP6_PARSER_EXCEPTION;
-extern const isc::log::MessageID DHCP6_PARSER_FAIL;
-extern const isc::log::MessageID DHCP6_PD_LEASE_ADVERT;
-extern const isc::log::MessageID DHCP6_PD_LEASE_ADVERT_FAIL;
-extern const isc::log::MessageID DHCP6_PD_LEASE_ALLOC;
-extern const isc::log::MessageID DHCP6_PD_LEASE_ALLOC_FAIL;
-extern const isc::log::MessageID DHCP6_PD_LEASE_RENEW;
-extern const isc::log::MessageID DHCP6_PROCESS_IA_NA_EXTEND;
-extern const isc::log::MessageID DHCP6_PROCESS_IA_NA_RELEASE;
-extern const isc::log::MessageID DHCP6_PROCESS_IA_NA_REQUEST;
-extern const isc::log::MessageID DHCP6_PROCESS_IA_PD_EXTEND;
-extern const isc::log::MessageID DHCP6_PROCESS_IA_PD_REQUEST;
-extern const isc::log::MessageID DHCP6_QUERY_DATA;
-extern const isc::log::MessageID DHCP6_RAPID_COMMIT;
-extern const isc::log::MessageID DHCP6_RELEASE_NA;
-extern const isc::log::MessageID DHCP6_RELEASE_NA_FAIL;
-extern const isc::log::MessageID DHCP6_RELEASE_NA_FAIL_WRONG_DUID;
-extern const isc::log::MessageID DHCP6_RELEASE_NA_FAIL_WRONG_IAID;
-extern const isc::log::MessageID DHCP6_RELEASE_PD;
-extern const isc::log::MessageID DHCP6_RELEASE_PD_FAIL;
-extern const isc::log::MessageID DHCP6_RELEASE_PD_FAIL_WRONG_DUID;
-extern const isc::log::MessageID DHCP6_RELEASE_PD_FAIL_WRONG_IAID;
-extern const isc::log::MessageID DHCP6_REQUIRED_OPTIONS_CHECK_FAIL;
-extern const isc::log::MessageID DHCP6_RESPONSE_DATA;
-extern const isc::log::MessageID DHCP6_SERVER_FAILED;
-extern const isc::log::MessageID DHCP6_SHUTDOWN;
-extern const isc::log::MessageID DHCP6_SHUTDOWN_REQUEST;
-extern const isc::log::MessageID DHCP6_SOCKET_UNICAST;
-extern const isc::log::MessageID DHCP6_SRV_CONSTRUCT_ERROR;
-extern const isc::log::MessageID DHCP6_SRV_D2STOP_ERROR;
-extern const isc::log::MessageID DHCP6_STANDALONE;
-extern const isc::log::MessageID DHCP6_STARTED;
-extern const isc::log::MessageID DHCP6_STARTING;
-extern const isc::log::MessageID DHCP6_START_INFO;
-extern const isc::log::MessageID DHCP6_SUBNET_DATA;
-extern const isc::log::MessageID DHCP6_SUBNET_DYNAMICALLY_CHANGED;
-extern const isc::log::MessageID DHCP6_SUBNET_SELECTED;
-extern const isc::log::MessageID DHCP6_SUBNET_SELECTION_FAILED;
-extern const isc::log::MessageID DHCP6_UNKNOWN_MSG_RECEIVED;
-extern const isc::log::MessageID DHCP6_USING_SERVERID;
-
-} // namespace dhcp
-} // namespace isc
-
-#endif // DHCP6_MESSAGES_H
diff --git a/src/bin/lfc/.gitignore b/src/bin/lfc/.gitignore
index 4ca5eb6c37..5c1604f3d3 100644
--- a/src/bin/lfc/.gitignore
+++ b/src/bin/lfc/.gitignore
@@ -1,4 +1,5 @@
 /kea-lfc
 /kea-lfc.8
 /lfc_messages.cc
+/lfc_messages.h
 /s-messages
diff --git a/src/bin/lfc/lfc_messages.h b/src/bin/lfc/lfc_messages.h
deleted file mode 100644
index 5da8c2d5cc..0000000000
--- a/src/bin/lfc/lfc_messages.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// File created from ../../../src/bin/lfc/lfc_messages.mes on Fri Oct 20 2017 00:29
-
-#ifndef LFC_MESSAGES_H
-#define LFC_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace lfc {
-
-extern const isc::log::MessageID LFC_FAIL_PID_CREATE;
-extern const isc::log::MessageID LFC_FAIL_PID_DEL;
-extern const isc::log::MessageID LFC_FAIL_PROCESS;
-extern const isc::log::MessageID LFC_FAIL_ROTATE;
-extern const isc::log::MessageID LFC_PROCESSING;
-extern const isc::log::MessageID LFC_READ_STATS;
-extern const isc::log::MessageID LFC_ROTATING;
-extern const isc::log::MessageID LFC_RUNNING;
-extern const isc::log::MessageID LFC_START;
-extern const isc::log::MessageID LFC_TERMINATE;
-extern const isc::log::MessageID LFC_WRITE_STATS;
-
-} // namespace lfc
-} // namespace isc
-
-#endif // LFC_MESSAGES_H
diff --git a/src/hooks/dhcp/lease_cmds/.gitignore b/src/hooks/dhcp/lease_cmds/.gitignore
index 47a13f1d37..310e853700 100644
--- a/src/hooks/dhcp/lease_cmds/.gitignore
+++ b/src/hooks/dhcp/lease_cmds/.gitignore
@@ -1,3 +1,4 @@
 /lease_cmds_messages.cc
+/lease_cmds_messages.h
 /s-messages
 /html
diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h
deleted file mode 100644
index 59266b4145..0000000000
--- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// File created from ../../../../src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes on Fri Oct 20 2017 00:29
-
-#ifndef LEASE_CMDS_MESSAGES_H
-#define LEASE_CMDS_MESSAGES_H
-
-#include <log/message_types.h>
-
-extern const isc::log::MessageID LEASE_CMDS_ADD4;
-extern const isc::log::MessageID LEASE_CMDS_ADD4_FAILED;
-extern const isc::log::MessageID LEASE_CMDS_ADD6;
-extern const isc::log::MessageID LEASE_CMDS_ADD6_FAILED;
-extern const isc::log::MessageID LEASE_CMDS_DEINIT_FAILED;
-extern const isc::log::MessageID LEASE_CMDS_DEINIT_OK;
-extern const isc::log::MessageID LEASE_CMDS_DEL4;
-extern const isc::log::MessageID LEASE_CMDS_DEL4_FAILED;
-extern const isc::log::MessageID LEASE_CMDS_DEL6;
-extern const isc::log::MessageID LEASE_CMDS_DEL6_FAILED;
-extern const isc::log::MessageID LEASE_CMDS_INIT_FAILED;
-extern const isc::log::MessageID LEASE_CMDS_INIT_OK;
-
-#endif // LEASE_CMDS_MESSAGES_H
diff --git a/src/hooks/dhcp/user_chk/.gitignore b/src/hooks/dhcp/user_chk/.gitignore
index 9352de72fe..76bf339e04 100644
--- a/src/hooks/dhcp/user_chk/.gitignore
+++ b/src/hooks/dhcp/user_chk/.gitignore
@@ -1,2 +1,3 @@
 /user_chk_messages.cc
+/user_chk_messages.h
 /s-messages
diff --git a/src/hooks/dhcp/user_chk/user_chk_messages.h b/src/hooks/dhcp/user_chk/user_chk_messages.h
deleted file mode 100644
index 3903404449..0000000000
--- a/src/hooks/dhcp/user_chk/user_chk_messages.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// File created from ../../../../src/hooks/dhcp/user_chk/user_chk_messages.mes on Fri Oct 20 2017 00:29
-
-#ifndef USER_CHK_MESSAGES_H
-#define USER_CHK_MESSAGES_H
-
-#include <log/message_types.h>
-
-extern const isc::log::MessageID USER_CHK_HOOK_LOAD_ERROR;
-extern const isc::log::MessageID USER_CHK_HOOK_UNLOAD_ERROR;
-extern const isc::log::MessageID USER_CHK_SUBNET4_SELECT_ERROR;
-extern const isc::log::MessageID USER_CHK_SUBNET4_SELECT_REGISTRY_NULL;
-extern const isc::log::MessageID USER_CHK_SUBNET6_SELECT_ERROR;
-extern const isc::log::MessageID USER_CHK_SUBNET6_SELECT_REGISTRY_NULL;
-
-#endif // USER_CHK_MESSAGES_H
diff --git a/src/lib/asiodns/.gitignore b/src/lib/asiodns/.gitignore
index 2007be9bde..189824e16d 100644
--- a/src/lib/asiodns/.gitignore
+++ b/src/lib/asiodns/.gitignore
@@ -1,2 +1,3 @@
 /asiodns_messages.cc
+/asiodns_messages.h
 /s-messages
diff --git a/src/lib/asiodns/asiodns_messages.h b/src/lib/asiodns/asiodns_messages.h
deleted file mode 100644
index 33b396b8c2..0000000000
--- a/src/lib/asiodns/asiodns_messages.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// File created from ../../../src/lib/asiodns/asiodns_messages.mes on Fri Oct 20 2017 00:23
-
-#ifndef ASIODNS_MESSAGES_H
-#define ASIODNS_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace asiodns {
-
-extern const isc::log::MessageID ASIODNS_FD_ADD_TCP;
-extern const isc::log::MessageID ASIODNS_FD_ADD_UDP;
-extern const isc::log::MessageID ASIODNS_FETCH_COMPLETED;
-extern const isc::log::MessageID ASIODNS_FETCH_STOPPED;
-extern const isc::log::MessageID ASIODNS_OPEN_SOCKET;
-extern const isc::log::MessageID ASIODNS_READ_DATA;
-extern const isc::log::MessageID ASIODNS_READ_TIMEOUT;
-extern const isc::log::MessageID ASIODNS_SEND_DATA;
-extern const isc::log::MessageID ASIODNS_SYNC_UDP_CLOSE_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_ACCEPT_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_CLEANUP_CLOSE_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_CLOSE_ACCEPTOR_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_CLOSE_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_CLOSE_NORESP_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_GETREMOTE_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_READDATA_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_READLEN_FAIL;
-extern const isc::log::MessageID ASIODNS_TCP_WRITE_FAIL;
-extern const isc::log::MessageID ASIODNS_UDP_ASYNC_SEND_FAIL;
-extern const isc::log::MessageID ASIODNS_UDP_CLOSE_FAIL;
-extern const isc::log::MessageID ASIODNS_UDP_RECEIVE_FAIL;
-extern const isc::log::MessageID ASIODNS_UDP_SYNC_RECEIVE_FAIL;
-extern const isc::log::MessageID ASIODNS_UDP_SYNC_SEND_FAIL;
-extern const isc::log::MessageID ASIODNS_UNKNOWN_ORIGIN;
-extern const isc::log::MessageID ASIODNS_UNKNOWN_RESULT;
-
-} // namespace asiodns
-} // namespace isc
-
-#endif // ASIODNS_MESSAGES_H
diff --git a/src/lib/config/.gitignore b/src/lib/config/.gitignore
index 23563c6303..d666f2469a 100644
--- a/src/lib/config/.gitignore
+++ b/src/lib/config/.gitignore
@@ -1,2 +1,3 @@
 /config_messages.cc
+/config_messages.h
 /s-messages
diff --git a/src/lib/config/config_messages.h b/src/lib/config/config_messages.h
deleted file mode 100644
index 62b4dd1487..0000000000
--- a/src/lib/config/config_messages.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// File created from ../../../src/lib/config/config_messages.mes on Fri Oct 20 2017 00:22
-
-#ifndef CONFIG_MESSAGES_H
-#define CONFIG_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace config {
-
-extern const isc::log::MessageID COMMAND_DEREGISTERED;
-extern const isc::log::MessageID COMMAND_EXTENDED_REGISTERED;
-extern const isc::log::MessageID COMMAND_PROCESS_ERROR1;
-extern const isc::log::MessageID COMMAND_PROCESS_ERROR2;
-extern const isc::log::MessageID COMMAND_RECEIVED;
-extern const isc::log::MessageID COMMAND_REGISTERED;
-extern const isc::log::MessageID COMMAND_RESPONSE_ERROR;
-extern const isc::log::MessageID COMMAND_SOCKET_ACCEPT_FAIL;
-extern const isc::log::MessageID COMMAND_SOCKET_CLOSED_BY_FOREIGN_HOST;
-extern const isc::log::MessageID COMMAND_SOCKET_CONNECTION_CANCEL_FAIL;
-extern const isc::log::MessageID COMMAND_SOCKET_CONNECTION_CLOSED;
-extern const isc::log::MessageID COMMAND_SOCKET_CONNECTION_CLOSE_FAIL;
-extern const isc::log::MessageID COMMAND_SOCKET_CONNECTION_OPENED;
-extern const isc::log::MessageID COMMAND_SOCKET_CONNECTION_SHUTDOWN_FAIL;
-extern const isc::log::MessageID COMMAND_SOCKET_CONNECTION_TIMEOUT;
-extern const isc::log::MessageID COMMAND_SOCKET_READ;
-extern const isc::log::MessageID COMMAND_SOCKET_READ_FAIL;
-extern const isc::log::MessageID COMMAND_SOCKET_WRITE;
-extern const isc::log::MessageID COMMAND_SOCKET_WRITE_FAIL;
-
-} // namespace config
-} // namespace isc
-
-#endif // CONFIG_MESSAGES_H
diff --git a/src/lib/dhcp_ddns/.gitignore b/src/lib/dhcp_ddns/.gitignore
index 102df08275..c632c2e100 100644
--- a/src/lib/dhcp_ddns/.gitignore
+++ b/src/lib/dhcp_ddns/.gitignore
@@ -1,2 +1,3 @@
 /dhcp_ddns_messages.cc
+/dhcp_ddns_messages.h
 /s-messages
diff --git a/src/lib/dhcp_ddns/dhcp_ddns_messages.h b/src/lib/dhcp_ddns/dhcp_ddns_messages.h
deleted file mode 100644
index c0bb3b87ca..0000000000
--- a/src/lib/dhcp_ddns/dhcp_ddns_messages.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// File created from ../../../src/lib/dhcp_ddns/dhcp_ddns_messages.mes on Fri Oct 20 2017 00:23
-
-#ifndef DHCP_DDNS_MESSAGES_H
-#define DHCP_DDNS_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace dhcp_ddns {
-
-extern const isc::log::MessageID DHCP_DDNS_INVALID_NCR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_FLUSH_IO_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_LISTEN_CLOSE_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_RECV_NEXT_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_SEND_CLOSE_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_SEND_NEXT_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_UDP_CLEAR_READY_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_UDP_RECV_CANCELED;
-extern const isc::log::MessageID DHCP_DDNS_NCR_UDP_RECV_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_NCR_UDP_SEND_CANCELED;
-extern const isc::log::MessageID DHCP_DDNS_NCR_UDP_SEND_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_UDP_SENDER_WATCH_SOCKET_CLOSE_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_UNCAUGHT_NCR_RECV_HANDLER_ERROR;
-extern const isc::log::MessageID DHCP_DDNS_UNCAUGHT_NCR_SEND_HANDLER_ERROR;
-
-} // namespace dhcp_ddns
-} // namespace isc
-
-#endif // DHCP_DDNS_MESSAGES_H
diff --git a/src/lib/dhcpsrv/.gitignore b/src/lib/dhcpsrv/.gitignore
index a7abfc0165..7c180b7632 100644
--- a/src/lib/dhcpsrv/.gitignore
+++ b/src/lib/dhcpsrv/.gitignore
@@ -1,4 +1,7 @@
 /alloc_engine_messages.cc
+/alloc_engine_messages.h
 /dhcpsrv_messages.cc
+/dhcpsrv_messages.h
 /hosts_messages.cc
+/hosts_messages.h
 /s-messages
diff --git a/src/lib/dhcpsrv/alloc_engine_messages.h b/src/lib/dhcpsrv/alloc_engine_messages.h
deleted file mode 100644
index 837476d41a..0000000000
--- a/src/lib/dhcpsrv/alloc_engine_messages.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// File created from ../../../src/lib/dhcpsrv/alloc_engine_messages.mes on Fri Oct 20 2017 00:23
-
-#ifndef ALLOC_ENGINE_MESSAGES_H
-#define ALLOC_ENGINE_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace dhcp {
-
-extern const isc::log::MessageID ALLOC_ENGINE_LEASE_RECLAIMED;
-extern const isc::log::MessageID ALLOC_ENGINE_REMOVAL_NCR_FAILED;
-extern const isc::log::MessageID ALLOC_ENGINE_RESERVATIONS_SKIPPED;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_ERROR;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_FAIL;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_DECLINED_RECOVERED;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_DISCOVER_ADDRESS_CONFLICT;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_DISCOVER_HR;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_LEASES_RECLAMATION_COMPLETE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_LEASES_RECLAMATION_SLOW;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_LEASES_RECLAMATION_START;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_LEASES_RECLAMATION_TIMEOUT;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_LEASE_RECLAIM;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_LEASE_RECLAMATION_FAILED;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_NO_MORE_EXPIRED_LEASES;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_OFFER_EXISTING_LEASE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_OFFER_NEW_LEASE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_OFFER_REQUESTED_LEASE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_RECLAIMED_LEASES_DELETE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_RECLAIMED_LEASES_DELETE_COMPLETE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_RECLAIMED_LEASES_DELETE_FAILED;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_ADDRESS_RESERVED;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_ALLOC_REQUESTED;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_EXTEND_LEASE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_INVALID;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_IN_USE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_OUT_OF_POOL;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_PICK_ADDRESS;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_REMOVE_LEASE;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REQUEST_USE_HR;
-extern const isc::log::MessageID ALLOC_ENGINE_V4_REUSE_EXPIRED_LEASE_DATA;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_ERROR;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_FAIL;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_HR_LEASE_EXISTS;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_LEASES_HR;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_LEASES_NO_HR;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_NO_LEASES_HR;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_NO_V6_HR;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_ALLOC_UNRESERVED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_DECLINED_RECOVERED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_EXPIRED_HINT_RESERVED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_EXTEND_ALLOC_UNRESERVED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_EXTEND_ERROR;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_EXTEND_LEASE;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_EXTEND_LEASE_DATA;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_EXTEND_NEW_LEASE_DATA;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_HINT_RESERVED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_HR_ADDR_GRANTED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_HR_PREFIX_GRANTED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_LEASES_RECLAMATION_COMPLETE;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_LEASES_RECLAMATION_SLOW;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_LEASES_RECLAMATION_START;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_LEASES_RECLAMATION_TIMEOUT;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_LEASE_RECLAIM;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_LEASE_RECLAMATION_FAILED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_NO_MORE_EXPIRED_LEASES;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_COMPLETE;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_FAILED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_HR;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_REMOVE_RESERVED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_REMOVE_UNRESERVED;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_REUSE_EXPIRED_LEASE_DATA;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_REVOKED_ADDR_LEASE;
-extern const isc::log::MessageID ALLOC_ENGINE_V6_REVOKED_PREFIX_LEASE;
-
-} // namespace dhcp
-} // namespace isc
-
-#endif // ALLOC_ENGINE_MESSAGES_H
diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h
deleted file mode 100644
index ac4adefdca..0000000000
--- a/src/lib/dhcpsrv/dhcpsrv_messages.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Fri Oct 20 2017 00:23
-
-#ifndef DHCPSRV_MESSAGES_H
-#define DHCPSRV_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace dhcp {
-
-extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_IFACE;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET4;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET6;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_CFG_DHCP_DDNS;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIGURE_SERVERID;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET4;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET6;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_NEW_SUBNET4;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_NEW_SUBNET6;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_NO_SUBNET4;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_NO_SUBNET6;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_ONLY_SUBNET4;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_ONLY_SUBNET6;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_OPTION_DUPLICATE;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SOCKET_RAW_UNSUPPORTED;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SOCKET_TYPE_DEFAULT;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SOCKET_TYPE_SELECT;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET4;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET4_ADDR;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET4_IFACE;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET4_RELAY;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET6;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET6_IFACE;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET6_IFACE_ID;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_SUBNET6_RELAY;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_UNICAST_LINK_LOCAL;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_ADDRESS;
-extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_UNICAST;
-extern const isc::log::MessageID DHCPSRV_CLOSE_DB;
-extern const isc::log::MessageID DHCPSRV_CQL_ADD_ADDR4;
-extern const isc::log::MessageID DHCPSRV_CQL_ADD_ADDR6;
-extern const isc::log::MessageID DHCPSRV_CQL_COMMIT;
-extern const isc::log::MessageID DHCPSRV_CQL_DB;
-extern const isc::log::MessageID DHCPSRV_CQL_DELETE_ADDR;
-extern const isc::log::MessageID DHCPSRV_CQL_DELETE_EXPIRED_RECLAIMED4;
-extern const isc::log::MessageID DHCPSRV_CQL_DELETE_EXPIRED_RECLAIMED6;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_ADDR4;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_ADDR6;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_CLIENTID_HWADDR_SUBID;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_EXPIRED4;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_EXPIRED6;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_HWADDR;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_IAID_DUID;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_IAID_SUBID_DUID;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_SUBID_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_SUBID_HWADDR;
-extern const isc::log::MessageID DHCPSRV_CQL_GET_VERSION;
-extern const isc::log::MessageID DHCPSRV_CQL_ROLLBACK;
-extern const isc::log::MessageID DHCPSRV_CQL_UPDATE_ADDR4;
-extern const isc::log::MessageID DHCPSRV_CQL_UPDATE_ADDR6;
-extern const isc::log::MessageID DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET;
-extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION;
-extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_HANDLER_NULL;
-extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_NCR_REJECTED;
-extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_NCR_SENT;
-extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_SENDER_STARTED;
-extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_SENDER_STOPPED;
-extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_SUSPEND_UPDATES;
-extern const isc::log::MessageID DHCPSRV_HOOK_LEASE4_RECOVER_SKIP;
-extern const isc::log::MessageID DHCPSRV_HOOK_LEASE4_RENEW_SKIP;
-extern const isc::log::MessageID DHCPSRV_HOOK_LEASE4_SELECT_SKIP;
-extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_EXTEND_SKIP;
-extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_RECOVER_SKIP;
-extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_SELECT_SKIP;
-extern const isc::log::MessageID DHCPSRV_INVALID_ACCESS;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_ADD_ADDR4;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_ADD_ADDR6;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_COMMIT;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_CONVERTING_LEASE_FILES;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_DB;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_ADDR;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED4;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED6;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED_START;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_ADDR4;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_ADDR6;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_CLIENTID_HWADDR_SUBID;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_EXPIRED4;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_EXPIRED6;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_HWADDR;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_IAID_DUID;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_IAID_SUBID_DUID;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_HWADDR;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_VERSION;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_FILE_LOAD;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_LOAD;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_LOAD_ROW_ERROR;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LFC_EXECUTE;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LFC_LEASE_FILE_RENAME_FAIL;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LFC_LEASE_FILE_REOPEN_FAIL;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LFC_SETUP;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LFC_SPAWN_FAIL;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LFC_START;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_LFC_UNREGISTER_TIMER_FAILED;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_NEEDS_DOWNGRADING;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_NEEDS_UPGRADING;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_NO_STORAGE;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_READ_HWADDR_FAIL;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_ROLLBACK;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_UPDATE_ADDR4;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_UPDATE_ADDR6;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES4;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES4_FINISHED;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES6;
-extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES6_FINISHED;
-extern const isc::log::MessageID DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE;
-extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR4;
-extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR6;
-extern const isc::log::MessageID DHCPSRV_MYSQL_COMMIT;
-extern const isc::log::MessageID DHCPSRV_MYSQL_DB;
-extern const isc::log::MessageID DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED;
-extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_ADDR;
-extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4;
-extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6;
-extern const isc::log::MessageID DHCPSRV_MYSQL_FATAL_ERROR;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR4;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR6;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_EXPIRED4;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_EXPIRED6;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_HWADDR;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_IAID_DUID;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_IAID_SUBID_DUID;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_HWADDR;
-extern const isc::log::MessageID DHCPSRV_MYSQL_GET_VERSION;
-extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB;
-extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_GET_VERSION;
-extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_READONLY;
-extern const isc::log::MessageID DHCPSRV_MYSQL_ROLLBACK;
-extern const isc::log::MessageID DHCPSRV_MYSQL_START_TRANSACTION;
-extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR4;
-extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR6;
-extern const isc::log::MessageID DHCPSRV_NOTYPE_DB;
-extern const isc::log::MessageID DHCPSRV_NO_SOCKETS_OPEN;
-extern const isc::log::MessageID DHCPSRV_OPEN_SOCKET_FAIL;
-extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR4;
-extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR6;
-extern const isc::log::MessageID DHCPSRV_PGSQL_COMMIT;
-extern const isc::log::MessageID DHCPSRV_PGSQL_DB;
-extern const isc::log::MessageID DHCPSRV_PGSQL_DEALLOC_ERROR;
-extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_ADDR;
-extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4;
-extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6;
-extern const isc::log::MessageID DHCPSRV_PGSQL_FATAL_ERROR;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR4;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR6;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_EXPIRED4;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_EXPIRED6;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_HWADDR;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_IAID_DUID;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_IAID_SUBID_DUID;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_CLIENTID;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_HWADDR;
-extern const isc::log::MessageID DHCPSRV_PGSQL_GET_VERSION;
-extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB;
-extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_GET_VERSION;
-extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_READONLY;
-extern const isc::log::MessageID DHCPSRV_PGSQL_ROLLBACK;
-extern const isc::log::MessageID DHCPSRV_PGSQL_START_TRANSACTION;
-extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR4;
-extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR6;
-extern const isc::log::MessageID DHCPSRV_QUEUE_NCR;
-extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_FAILED;
-extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_SKIP;
-extern const isc::log::MessageID DHCPSRV_TIMERMGR_CALLBACK_FAILED;
-extern const isc::log::MessageID DHCPSRV_TIMERMGR_REGISTER_TIMER;
-extern const isc::log::MessageID DHCPSRV_TIMERMGR_RUN_TIMER_OPERATION;
-extern const isc::log::MessageID DHCPSRV_TIMERMGR_START_TIMER;
-extern const isc::log::MessageID DHCPSRV_TIMERMGR_STOP_TIMER;
-extern const isc::log::MessageID DHCPSRV_TIMERMGR_UNREGISTER_ALL_TIMERS;
-extern const isc::log::MessageID DHCPSRV_TIMERMGR_UNREGISTER_TIMER;
-extern const isc::log::MessageID DHCPSRV_UNEXPECTED_NAME;
-extern const isc::log::MessageID DHCPSRV_UNKNOWN_DB;
-
-} // namespace dhcp
-} // namespace isc
-
-#endif // DHCPSRV_MESSAGES_H
diff --git a/src/lib/dhcpsrv/hosts_messages.h b/src/lib/dhcpsrv/hosts_messages.h
deleted file mode 100644
index 6f458bda36..0000000000
--- a/src/lib/dhcpsrv/hosts_messages.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// File created from ../../../src/lib/dhcpsrv/hosts_messages.mes on Fri Oct 20 2017 00:23
-
-#ifndef HOSTS_MESSAGES_H
-#define HOSTS_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace dhcp {
-
-extern const isc::log::MessageID HOSTS_CFG_ADD_HOST;
-extern const isc::log::MessageID HOSTS_CFG_CLOSE_HOST_DATA_SOURCE;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_ADDRESS4;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_ADDRESS4_COUNT;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_ADDRESS4_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_ADDRESS6;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_ADDRESS6_COUNT;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_ADDRESS6_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_HWADDR_DUID;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_IDENTIFIER;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_IDENTIFIER_COUNT;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_IDENTIFIER_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6_COUNT;
-extern const isc::log::MessageID HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_PREFIX;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_PREFIX_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_PREFIX_NULL;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_NULL;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_NULL;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER_HOST;
-extern const isc::log::MessageID HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER_NULL;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_ADDRESS4;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_HWADDR_DUID;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER_HOST;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER_NULL;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET6_PREFIX;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_ADDRESS6;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_DUID_HWADDR;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_HOST;
-extern const isc::log::MessageID HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_NULL;
-
-} // namespace dhcp
-} // namespace isc
-
-#endif // HOSTS_MESSAGES_H
diff --git a/src/lib/eval/.gitignore b/src/lib/eval/.gitignore
index 2b19683466..c16e2ccba1 100644
--- a/src/lib/eval/.gitignore
+++ b/src/lib/eval/.gitignore
@@ -1,2 +1,3 @@
 /eval_messages.cc
+/eval_messages.h
 /s-messages
diff --git a/src/lib/eval/eval_messages.h b/src/lib/eval/eval_messages.h
deleted file mode 100644
index 64bcb39a86..0000000000
--- a/src/lib/eval/eval_messages.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// File created from ../../../src/lib/eval/eval_messages.mes on Fri Oct 20 2017 00:23
-
-#ifndef EVAL_MESSAGES_H
-#define EVAL_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace dhcp {
-
-extern const isc::log::MessageID EVAL_DEBUG_AND;
-extern const isc::log::MessageID EVAL_DEBUG_CONCAT;
-extern const isc::log::MessageID EVAL_DEBUG_EQUAL;
-extern const isc::log::MessageID EVAL_DEBUG_HEXSTRING;
-extern const isc::log::MessageID EVAL_DEBUG_IFELSE_FALSE;
-extern const isc::log::MessageID EVAL_DEBUG_IFELSE_TRUE;
-extern const isc::log::MessageID EVAL_DEBUG_IPADDRESS;
-extern const isc::log::MessageID EVAL_DEBUG_NOT;
-extern const isc::log::MessageID EVAL_DEBUG_OPTION;
-extern const isc::log::MessageID EVAL_DEBUG_OR;
-extern const isc::log::MessageID EVAL_DEBUG_PKT;
-extern const isc::log::MessageID EVAL_DEBUG_PKT4;
-extern const isc::log::MessageID EVAL_DEBUG_PKT6;
-extern const isc::log::MessageID EVAL_DEBUG_RELAY6;
-extern const isc::log::MessageID EVAL_DEBUG_RELAY6_RANGE;
-extern const isc::log::MessageID EVAL_DEBUG_STRING;
-extern const isc::log::MessageID EVAL_DEBUG_SUBSTRING;
-extern const isc::log::MessageID EVAL_DEBUG_SUBSTRING_EMPTY;
-extern const isc::log::MessageID EVAL_DEBUG_SUBSTRING_RANGE;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_CLASS_DATA;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_CLASS_DATA_NOT_FOUND;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_CLASS_ENTERPRISE_ID;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_CLASS_ENTERPRISE_ID_MISMATCH;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_CLASS_EXISTS;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_CLASS_NO_OPTION;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_EXISTS;
-extern const isc::log::MessageID EVAL_DEBUG_VENDOR_NO_OPTION;
-extern const isc::log::MessageID EVAL_RESULT;
-
-} // namespace dhcp
-} // namespace isc
-
-#endif // EVAL_MESSAGES_H
diff --git a/src/lib/hooks/.gitignore b/src/lib/hooks/.gitignore
index 0f2f19ab92..89adbe1baf 100644
--- a/src/lib/hooks/.gitignore
+++ b/src/lib/hooks/.gitignore
@@ -1,2 +1,3 @@
 /hooks_messages.cc
+/hooks_messages.h
 /s-messages
diff --git a/src/lib/hooks/hooks_messages.h b/src/lib/hooks/hooks_messages.h
deleted file mode 100644
index 28748d511d..0000000000
--- a/src/lib/hooks/hooks_messages.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// File created from ../../../src/lib/hooks/hooks_messages.mes on Fri Oct 20 2017 00:21
-
-#ifndef HOOKS_MESSAGES_H
-#define HOOKS_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace hooks {
-
-extern const isc::log::MessageID HOOKS_ALL_CALLOUTS_DEREGISTERED;
-extern const isc::log::MessageID HOOKS_CALLOUTS_BEGIN;
-extern const isc::log::MessageID HOOKS_CALLOUTS_COMPLETE;
-extern const isc::log::MessageID HOOKS_CALLOUTS_REMOVED;
-extern const isc::log::MessageID HOOKS_CALLOUT_CALLED;
-extern const isc::log::MessageID HOOKS_CALLOUT_DEREGISTERED;
-extern const isc::log::MessageID HOOKS_CALLOUT_ERROR;
-extern const isc::log::MessageID HOOKS_CALLOUT_EXCEPTION;
-extern const isc::log::MessageID HOOKS_CALLOUT_REGISTRATION;
-extern const isc::log::MessageID HOOKS_CLOSE_ERROR;
-extern const isc::log::MessageID HOOKS_HOOK_LIST_RESET;
-extern const isc::log::MessageID HOOKS_INCORRECT_VERSION;
-extern const isc::log::MessageID HOOKS_LIBRARY_LOADED;
-extern const isc::log::MessageID HOOKS_LIBRARY_LOADING;
-extern const isc::log::MessageID HOOKS_LIBRARY_UNLOADED;
-extern const isc::log::MessageID HOOKS_LIBRARY_UNLOADING;
-extern const isc::log::MessageID HOOKS_LIBRARY_VERSION;
-extern const isc::log::MessageID HOOKS_LOAD_ERROR;
-extern const isc::log::MessageID HOOKS_LOAD_EXCEPTION;
-extern const isc::log::MessageID HOOKS_LOAD_FRAMEWORK_EXCEPTION;
-extern const isc::log::MessageID HOOKS_LOAD_SUCCESS;
-extern const isc::log::MessageID HOOKS_NO_LOAD;
-extern const isc::log::MessageID HOOKS_NO_UNLOAD;
-extern const isc::log::MessageID HOOKS_NO_VERSION;
-extern const isc::log::MessageID HOOKS_OPEN_ERROR;
-extern const isc::log::MessageID HOOKS_STD_CALLOUT_REGISTERED;
-extern const isc::log::MessageID HOOKS_UNLOAD_ERROR;
-extern const isc::log::MessageID HOOKS_UNLOAD_EXCEPTION;
-extern const isc::log::MessageID HOOKS_UNLOAD_FRAMEWORK_EXCEPTION;
-extern const isc::log::MessageID HOOKS_UNLOAD_SUCCESS;
-extern const isc::log::MessageID HOOKS_VERSION_EXCEPTION;
-
-} // namespace hooks
-} // namespace isc
-
-#endif // HOOKS_MESSAGES_H
diff --git a/src/lib/process/.gitignore b/src/lib/process/.gitignore
index 94081b547d..8dabb6acf4 100644
--- a/src/lib/process/.gitignore
+++ b/src/lib/process/.gitignore
@@ -1,4 +1,5 @@
 /process_messages.cc
+/process_messages.h
 /spec_config.h
 /spec_config.h.pre
 /s-messages
diff --git a/src/lib/process/process_messages.h b/src/lib/process/process_messages.h
deleted file mode 100644
index a1b7a42b31..0000000000
--- a/src/lib/process/process_messages.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// File created from ../../../src/lib/process/process_messages.mes on Fri Oct 20 2017 00:25
-
-#ifndef PROCESS_MESSAGES_H
-#define PROCESS_MESSAGES_H
-
-#include <log/message_types.h>
-
-namespace isc {
-namespace process {
-
-extern const isc::log::MessageID DCTL_ALREADY_RUNNING;
-extern const isc::log::MessageID DCTL_CCSESSION_ENDING;
-extern const isc::log::MessageID DCTL_CCSESSION_STARTING;
-extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_ERROR;
-extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD;
-extern const isc::log::MessageID DCTL_COMMAND_RECEIVED;
-extern const isc::log::MessageID DCTL_CONFIG_CHECK_COMPLETE;
-extern const isc::log::MessageID DCTL_CONFIG_COMPLETE;
-extern const isc::log::MessageID DCTL_CONFIG_FILE_LOAD_FAIL;
-extern const isc::log::MessageID DCTL_CONFIG_LOAD_FAIL;
-extern const isc::log::MessageID DCTL_CONFIG_START;
-extern const isc::log::MessageID DCTL_CONFIG_STUB;
-extern const isc::log::MessageID DCTL_CONFIG_UPDATE;
-extern const isc::log::MessageID DCTL_INIT_PROCESS;
-extern const isc::log::MessageID DCTL_INIT_PROCESS_FAIL;
-extern const isc::log::MessageID DCTL_NOT_RUNNING;
-extern const isc::log::MessageID DCTL_PARSER_FAIL;
-extern const isc::log::MessageID DCTL_PID_FILE_ERROR;
-extern const isc::log::MessageID DCTL_PROCESS_FAILED;
-extern const isc::log::MessageID DCTL_RUN_PROCESS;
-extern const isc::log::MessageID DCTL_SESSION_FAIL;
-extern const isc::log::MessageID DCTL_SHUTDOWN;
-extern const isc::log::MessageID DCTL_SHUTDOWN_SIGNAL_RECVD;
-extern const isc::log::MessageID DCTL_SIGNAL_ERROR;
-extern const isc::log::MessageID DCTL_STANDALONE;
-extern const isc::log::MessageID DCTL_STARTING;
-extern const isc::log::MessageID DCTL_UNSUPPORTED_SIGNAL;
-
-} // namespace process
-} // namespace isc
-
-#endif // PROCESS_MESSAGES_H