--- a/libirccd-core/CMakeLists.txt	Sun Nov 11 14:56:04 2018 +0100
+++ b/libirccd-core/CMakeLists.txt	Sun Nov 11 15:44:20 2018 +0100
@@ -21,33 +21,29 @@
 find_package(Boost 1.60 REQUIRED QUIET COMPONENTS filesystem system)
 
 set(
-	HEADERS
+	SOURCES
 	${libirccd-core_SOURCE_DIR}/irccd/acceptor.hpp
+	${libirccd-core_SOURCE_DIR}/irccd/config.cpp
 	${libirccd-core_SOURCE_DIR}/irccd/config.hpp
 	${libirccd-core_SOURCE_DIR}/irccd/connector.hpp
+	${libirccd-core_SOURCE_DIR}/irccd/fs_util.cpp
 	${libirccd-core_SOURCE_DIR}/irccd/fs_util.hpp
+	${libirccd-core_SOURCE_DIR}/irccd/ini.cpp
 	${libirccd-core_SOURCE_DIR}/irccd/ini.hpp
 	${libirccd-core_SOURCE_DIR}/irccd/ini_util.hpp
+	${libirccd-core_SOURCE_DIR}/irccd/json_util.cpp
 	${libirccd-core_SOURCE_DIR}/irccd/json_util.hpp
+	${libirccd-core_SOURCE_DIR}/irccd/options.cpp
 	${libirccd-core_SOURCE_DIR}/irccd/options.hpp
 	${libirccd-core_SOURCE_DIR}/irccd/stream.hpp
+	${libirccd-core_SOURCE_DIR}/irccd/string_util.cpp
 	${libirccd-core_SOURCE_DIR}/irccd/string_util.hpp
+	${libirccd-core_SOURCE_DIR}/irccd/system.cpp
 	${libirccd-core_SOURCE_DIR}/irccd/system.hpp
 	${libirccd-core_SOURCE_DIR}/irccd/xdg.hpp
 )
 
 set(
-	SOURCES
-	${libirccd-core_SOURCE_DIR}/irccd/config.cpp
-	${libirccd-core_SOURCE_DIR}/irccd/fs_util.cpp
-	${libirccd-core_SOURCE_DIR}/irccd/ini.cpp
-	${libirccd-core_SOURCE_DIR}/irccd/json_util.cpp
-	${libirccd-core_SOURCE_DIR}/irccd/options.cpp
-	${libirccd-core_SOURCE_DIR}/irccd/string_util.cpp
-	${libirccd-core_SOURCE_DIR}/irccd/system.cpp
-)
-
-set(
 	LIBRARIES
 	${CMAKE_DL_LIBS}
 	libjson
@@ -76,13 +72,11 @@
 	TARGET libirccd-core
 	EXPORT
 	FLAGS ${FLAGS}
-	HEADERS ${HEADERS}
-	HEADERS_DIRECTORY irccd
+	HEADERS ${libirccd-core_SOURCE_DIR}/irccd/
 	SOURCES ${SOURCES}
 	LIBRARIES ${LIBRARIES}
 	PUBLIC_INCLUDES
 		$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
 		$<BUILD_INTERFACE:${libirccd-core_SOURCE_DIR}>
 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/irccd/extern>
 )