--- a/libirccd-ctl/CMakeLists.txt	Fri Nov 16 12:20:54 2018 +0100
+++ b/libirccd-ctl/CMakeLists.txt	Fri Nov 16 12:54:06 2018 +0100
@@ -20,6 +20,7 @@
 
 set(
 	SOURCES
+	${libirccd-ctl_SOURCE_DIR}/irccd/ctl.hpp
 	${libirccd-ctl_SOURCE_DIR}/irccd/ctl/controller.cpp
 	${libirccd-ctl_SOURCE_DIR}/irccd/ctl/controller.hpp
 )
@@ -27,7 +28,7 @@
 irccd_define_library(
 	TARGET libirccd-ctl
 	EXPORT
-	HEADERS ${libirccd-ctl_SOURCE_DIR}/irccd/ctl
+	HEADERS ${libirccd-ctl_SOURCE_DIR}/irccd/
 	SOURCES ${SOURCES}
 	LIBRARIES
 		libirccd-daemon

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libirccd-ctl/irccd/ctl.hpp	Fri Nov 16 12:54:06 2018 +0100
@@ -0,0 +1,31 @@
+/*
+ * ctl.hpp -- libirccd-ctl convenience header
+ *
+ * Copyright (c) 2013-2018 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef IRCCD_CTL_HPP
+#define IRCCD_CTL_HPP
+
+/**
+ * \file ctl.hpp
+ * \brief libirccd-ctl convenience header.
+ */
+
+#include "sysconfig.hpp"
+
+#include "ctl/controller.hpp"
+
+#endif // !IRCCD_CTL_HPP

--- a/libirccd-daemon/CMakeLists.txt	Fri Nov 16 12:20:54 2018 +0100
+++ b/libirccd-daemon/CMakeLists.txt	Fri Nov 16 12:54:06 2018 +0100
@@ -20,6 +20,7 @@
 
 set(
 	SOURCES
+	${libirccd-daemon_SOURCE_DIR}/irccd/daemon.hpp
 	${libirccd-daemon_SOURCE_DIR}/irccd/daemon/bot.cpp
 	${libirccd-daemon_SOURCE_DIR}/irccd/daemon/bot.hpp
 	${libirccd-daemon_SOURCE_DIR}/irccd/daemon/command.cpp
@@ -59,7 +60,7 @@
 irccd_define_library(
 	TARGET libirccd-daemon
 	EXPORT
-	HEADERS ${libirccd-daemon_SOURCE_DIR}/irccd/daemon
+	HEADERS ${libirccd-daemon_SOURCE_DIR}/irccd/
 	SOURCES ${SOURCES}
 	LIBRARIES libirccd
 	PUBLIC_INCLUDES $<BUILD_INTERFACE:${libirccd-daemon_SOURCE_DIR}>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libirccd-daemon/irccd/daemon.hpp	Fri Nov 16 12:54:06 2018 +0100
@@ -0,0 +1,47 @@
+/*
+ * daemon.hpp -- libirccd-daemon convenience header
+ *
+ * Copyright (c) 2013-2018 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef IRCCD_DAEMON_HPP
+#define IRCCD_DAEMON_HPP
+
+/**
+ * \file daemon.hpp
+ * \brief libirccd-daemon convenience header.
+ */
+
+#include "sysconfig.hpp"
+
+#include "daemon/server_service.hpp"
+#include "daemon/plugin.hpp"
+#include "daemon/plugin_service.hpp"
+#include "daemon/command.hpp"
+#include "daemon/rule_service.hpp"
+#include "daemon/bot.hpp"
+#include "daemon/rule.hpp"
+#include "daemon/logger.hpp"
+#include "daemon/transport_client.hpp"
+#include "daemon/rule_util.hpp"
+#include "daemon/server_util.hpp"
+#include "daemon/transport_util.hpp"
+#include "daemon/transport_server.hpp"
+#include "daemon/transport_service.hpp"
+#include "daemon/dynlib_plugin.hpp"
+#include "daemon/irc.hpp"
+#include "daemon/server.hpp"
+
+#endif // !IRCCD_DAEMON_HPP

--- a/libirccd-js/CMakeLists.txt	Fri Nov 16 12:20:54 2018 +0100
+++ b/libirccd-js/CMakeLists.txt	Fri Nov 16 12:54:06 2018 +0100
@@ -22,6 +22,7 @@
 
 set(
 	SOURCES
+	${libirccd-js_SOURCE_DIR}/irccd/js.hpp
 	${libirccd-js_SOURCE_DIR}/irccd/js/directory_js_api.cpp
 	${libirccd-js_SOURCE_DIR}/irccd/js/directory_js_api.hpp
 	${libirccd-js_SOURCE_DIR}/irccd/js/duk.cpp
@@ -57,7 +58,7 @@
 irccd_define_library(
 	TARGET libirccd-js
 	EXPORT
-	HEADERS ${libirccd-js_SOURCE_DIR}/irccd/js
+	HEADERS ${libirccd-js_SOURCE_DIR}/irccd/
 	SOURCES
 		${SOURCES}
 	LIBRARIES

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libirccd-js/irccd/js.hpp	Fri Nov 16 12:54:06 2018 +0100
@@ -0,0 +1,45 @@
+/*
+ * js.hpp -- libirccd-js convenience header
+ *
+ * Copyright (c) 2013-2018 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef IRCCD_JS_HPP
+#define IRCCD_JS_HPP
+
+/**
+ * \file js.hpp
+ * \brief libirccd-js convenience header.
+ */
+
+#include "sysconfig.hpp"
+
+#include "js/file_js_api.hpp"
+#include "js/unicode.hpp"
+#include "js/directory_js_api.hpp"
+#include "js/js_plugin.hpp"
+#include "js/js_api.hpp"
+#include "js/timer_js_api.hpp"
+#include "js/unicode_js_api.hpp"
+#include "js/util_js_api.hpp"
+#include "js/duk.hpp"
+#include "js/elapsed_timer_js_api.hpp"
+#include "js/system_js_api.hpp"
+#include "js/logger_js_api.hpp"
+#include "js/irccd_js_api.hpp"
+#include "js/plugin_js_api.hpp"
+#include "js/server_js_api.hpp"
+
+#endif // !IRCCD_JS_HPP

--- a/libirccd-test/CMakeLists.txt	Fri Nov 16 12:20:54 2018 +0100
+++ b/libirccd-test/CMakeLists.txt	Fri Nov 16 12:54:06 2018 +0100
@@ -20,6 +20,7 @@
 
 set(
 	SOURCES
+	${libirccd-test_SOURCE_DIR}/irccd/test.hpp
 	${libirccd-test_SOURCE_DIR}/irccd/test/cli_fixture.cpp
 	${libirccd-test_SOURCE_DIR}/irccd/test/cli_fixture.hpp
 	${libirccd-test_SOURCE_DIR}/irccd/test/command_fixture.cpp
@@ -55,7 +56,7 @@
 irccd_define_library(
 	TARGET libirccd-test
 	EXPORT
-	HEADERS ${libirccd-test_SOURCE_DIR}/irccd/test
+	HEADERS ${libirccd-test_SOURCE_DIR}/irccd/
 	SOURCES ${SOURCES}
 	LIBRARIES
 		${LIBRARIES}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libirccd-test/irccd/test.hpp	Fri Nov 16 12:54:06 2018 +0100
@@ -0,0 +1,39 @@
+/*
+ * test.hpp -- libirccd-test convenience header
+ *
+ * Copyright (c) 2013-2018 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef IRCCD_TEST_HPP
+#define IRCCD_TEST_HPP
+
+/**
+ * \file test.hpp
+ * \brief libirccd-test convenience header.
+ */
+
+#include "sysconfig.hpp"
+
+#include "test/irccd_fixture.hpp"
+#include "test/js_plugin_fixture.hpp"
+#include "test/mock.hpp"
+#include "test/mock_server.hpp"
+#include "test/mock_plugin.hpp"
+#include "test/cli_fixture.hpp"
+#include "test/js_fixture.hpp"
+#include "test/debug_server.hpp"
+#include "test/command_fixture.hpp"
+
+#endif // !IRCCD_TEST_HPP

--- a/libirccd/CMakeLists.txt	Fri Nov 16 12:20:54 2018 +0100
+++ b/libirccd/CMakeLists.txt	Fri Nov 16 12:54:06 2018 +0100
@@ -26,6 +26,7 @@
 	${libirccd_SOURCE_DIR}/irccd/config.cpp
 	${libirccd_SOURCE_DIR}/irccd/config.hpp
 	${libirccd_SOURCE_DIR}/irccd/connector.hpp
+	${libirccd_SOURCE_DIR}/irccd/core.hpp
 	${libirccd_SOURCE_DIR}/irccd/fs_util.cpp
 	${libirccd_SOURCE_DIR}/irccd/fs_util.hpp
 	${libirccd_SOURCE_DIR}/irccd/ini.cpp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libirccd/irccd/core.hpp	Fri Nov 16 12:54:06 2018 +0100
@@ -0,0 +1,43 @@
+/*
+ * core.hpp -- libirccd convenience header
+ *
+ * Copyright (c) 2013-2018 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef IRCCD_CORE_HPP
+#define IRCCD_CORE_HPP
+
+/**
+ * \file core.hpp
+ * \brief libirccd convenience header.
+ */
+
+#include "sysconfig.hpp"
+
+#include "acceptor.hpp"
+#include "core.hpp"
+#include "string_util.hpp"
+#include "fs_util.hpp"
+#include "system.hpp"
+#include "json_util.hpp"
+#include "stream.hpp"
+#include "options.hpp"
+#include "config.hpp"
+#include "connector.hpp"
+#include "ini.hpp"
+#include "ini_util.hpp"
+#include "xdg.hpp"
+
+#endif // !IRCCD_CORE_HPP