diff --git a/Makefile b/Makefile
index 556aeb10f..e63a83e7e 100644
--- a/Makefile
+++ b/Makefile
@@ -165,6 +165,6 @@ clean:   $(addprefix clean-,  $(filter-out thirdparty doc clients,$(MODULES)))
 
 .PHONY: all everything clean install
 
--include $(wildcard $(SRCDIR)/Makefile.*)
--include $(wildcard $(BUILDDIR)/**/*.d)
--include $(patsubst %,$(SRCDIR)/%/Makefile.inc,$(MODULES))
+include $(wildcard $(SRCDIR)/Makefile.*)
+include $(wildcard $(BUILDDIR)/**/*.d)
+include $(patsubst %,$(SRCDIR)/%/Makefile.inc,$(MODULES))
diff --git a/clients/Makefile.inc b/clients/Makefile.inc
index 79e330560..529a0f613 100644
--- a/clients/Makefile.inc
+++ b/clients/Makefile.inc
@@ -22,10 +22,10 @@
 
 CLIENTS =
 
--include $(SRCDIR)/clients/python/Makefile.inc
+include $(SRCDIR)/clients/python/Makefile.inc
 	
 ifneq ($(wildcard $(SRCDIR)/thirdparty/libopal/include/opal/AsyncApi.h),)
-	-include $(SRCDIR)/clients/opal/Makefile.inc
+	include $(SRCDIR)/clients/opal/Makefile.inc
 endif
 
 clients: $(addprefix clients-,$(CLIENTS))
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index e59bf8d51..129ef0a4e 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -26,11 +26,11 @@ LIBS = $(patsubst %, lib%, $(SONAMES))
 
 LIB_CFLAGS  = $(CFLAGS) -fPIC
 
--include lib/hooks/Makefile.inc
--include lib/nodes/Makefile.inc
--include lib/io/Makefile.inc
+include lib/hooks/Makefile.inc
+include lib/nodes/Makefile.inc
+include lib/io/Makefile.inc
 
--include $(patsubst %, lib/Makefile.%.inc, $(SONAMES))
+include $(patsubst %, lib/Makefile.%.inc, $(SONAMES))
 
 LIB_CFLAGS += $(addprefix -DWITH_, $(call escape,$(LIB_PKGS)))
 
diff --git a/lib/Makefile.villas.inc b/lib/Makefile.villas.inc
index 8bca34b8a..de6088bd2 100644
--- a/lib/Makefile.villas.inc
+++ b/lib/Makefile.villas.inc
@@ -52,7 +52,7 @@ ifeq ($(WITH_WEB),1)
 endif
 
 ifeq ($(WITH_API),1)
-	-include lib/api/Makefile.inc
+	include lib/api/Makefile.inc
 endif
 
 # Add flags by pkg-config
diff --git a/lib/api/Makefile.inc b/lib/api/Makefile.inc
index a9d0a41c4..572cc8914 100644
--- a/lib/api/Makefile.inc
+++ b/lib/api/Makefile.inc
@@ -25,4 +25,4 @@ LIB_SRCS += $(wildcard lib/api/*.c)
 
 LIB_CFLAGS += -DWITH_API
 
--include lib/api/actions/Makefile.inc
+include lib/api/actions/Makefile.inc
diff --git a/lib/fpga/ips/Makefile.inc b/lib/fpga/ips/Makefile.inc
index ed3a1354f..ca6f74d36 100644
--- a/lib/fpga/ips/Makefile.inc
+++ b/lib/fpga/ips/Makefile.inc
@@ -22,4 +22,4 @@
 
 LIB_SRCS += $(wildcard lib/fpga/*.c)
 
--include lib/fpga/ips/Makefile.inc
+include lib/fpga/ips/Makefile.inc
diff --git a/lib/nodes/Makefile.inc b/lib/nodes/Makefile.inc
index 0ddb86bb2..782a636af 100644
--- a/lib/nodes/Makefile.inc
+++ b/lib/nodes/Makefile.inc
@@ -92,7 +92,7 @@ ifeq ($(shell $(PKGCONFIG) libxil; echo $$?),0)
 	LIB_SRCS    += $(addprefix lib/nodes/, fpga.c) \
 	               $(addprefix lib/kernel/, pci.c vfio.c) \
 
-	-include lib/fpga/Makefile.inc
+	include lib/fpga/Makefile.inc
 
 	LIB_PKGS    += libxil
 	LIB_CFLAGS += -DWITH_FPGA
diff --git a/packaging/Makefile.inc b/packaging/Makefile.inc
index 2c87a045f..1401b0793 100644
--- a/packaging/Makefile.inc
+++ b/packaging/Makefile.inc
@@ -72,4 +72,4 @@ install-packaging:
 
 .PHONY: packaging install-packaging clean-packaging deploy deploy-dist deploy-rpm dist docker docker-dev run-docker-dev $(TAR_VILLAS)
 
--include packaging/rpm/Makefile.inc
+include packaging/rpm/Makefile.inc
diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index b7344acd1..400aeefbe 100644
--- a/tests/Makefile.inc
+++ b/tests/Makefile.inc
@@ -20,8 +20,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
 
--include tests/unit/Makefile.inc
--include tests/integration/Makefile.inc
+include tests/unit/Makefile.inc
+include tests/integration/Makefile.inc
 
 tests: unit-tests integration-tests
 
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 29600e300..045a03e7b 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -41,7 +41,7 @@ $(BUILDDIR)/unit-tests: $(TEST_OBJS) $(LIB)
 	$(CC) $(TEST_LDFLAGS) $^ $(TEST_LDLIBS) -o $@
 
 ifdef COVERAGE
--include tests/unit/Makefile.gcov.inc
+	include tests/unit/Makefile.gcov.inc
 endif
 
 # Tests are not installed