diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 129ef0a4e..ce78e8ee6 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -26,6 +26,7 @@ LIBS = $(patsubst %, lib%, $(SONAMES))
 
 LIB_CFLAGS  = $(CFLAGS) -fPIC
 
+include lib/kernel/Makefile.inc
 include lib/hooks/Makefile.inc
 include lib/nodes/Makefile.inc
 include lib/io/Makefile.inc
diff --git a/lib/Makefile.villas.inc b/lib/Makefile.villas.inc
index 766d44a99..a171b550c 100644
--- a/lib/Makefile.villas.inc
+++ b/lib/Makefile.villas.inc
@@ -28,8 +28,7 @@ WITH_WEB  ?= 1
 WITH_API  ?= 1
 
 # Object files for libvillas
-LIB_SRCS += $(addprefix lib/kernel/, kernel.c rt.c) \
-            $(addprefix lib/, sample.c path.c node.c hook.c log.c log_config.c \
+LIB_SRCS += $(addprefix lib/, sample.c path.c node.c hook.c log.c log_config.c \
                utils.c super_node.c hist.c timing.c pool.c list.c queue.c \
                queue_signalled.c memory.c advio.c plugin.c node_type.c stats.c \
                mapping.c io.c shmem.c config_helper.c crypt.c compat.c \
diff --git a/lib/kernel/Makefile.inc b/lib/kernel/Makefile.inc
new file mode 100644
index 000000000..87e905d7d
--- /dev/null
+++ b/lib/kernel/Makefile.inc
@@ -0,0 +1,23 @@
+# Makefile.
+#
+# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+# @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
+# @license GNU General Public License (version 3)
+#
+# VILLASnode
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###################################################################################
+
+LIB_SRCS += $(addprefix lib/kernel/, kernel.c rt.c)