diff --git a/modules/Makefile.in b/modules/Makefile.in
index f023424d..c4e0d871 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -53,6 +53,8 @@ ifneq "$(LIBZNC)" ""
 LDFLAGS += -L.. -lznc -Wl,-rpath,$(LIBZNCDIR)
 endif
 
+CLEAN    :=
+
 FILES    := $(notdir $(wildcard $(srcdir)/*.cpp))
 # If extra is enabled
 ifeq "@EXTRA@" "yes"
@@ -85,7 +87,7 @@ charsetFLAGS := @LIBICONV@
 
 TARGETS  := $(addsuffix .so, $(FILES))
 
-CLEAN    := *.so extra/*.so
+CLEAN    += *.so extra/*.so
 
 .PHONY: all clean install install_metadirs create_install_dir uninstall
 
diff --git a/modules/modperl/Makefile.inc b/modules/modperl/Makefile.inc
index 5d31aafc..1cd4b919 100644
--- a/modules/modperl/Makefile.inc
+++ b/modules/modperl/Makefile.inc
@@ -8,14 +8,15 @@ PERLCOMMON   += -DSWIG_TYPE_TABLE=znc
 modperlFLAGS := $(PERLCOMMON)
 # Find additional headers for out-of-tree build
 modperlFLAGS += -I.
+
 PERLHOOK     := modperl_install
+CLEAN    += modperl/ZNC.so modperl/ZNC.pm
+CLEAN    += modperl/swigperlrun.h modperl/ZNC.cpp modperl/functions.cpp
+
 else
 FILES    := $(shell echo $(FILES) | sed -e "s/modperl//")
 endif
 
-CLEAN    += modperl/ZNC.so modperl/ZNC.pm
-CLEAN    += modperl/swigperlrun.h modperl/ZNC.cpp modperl/functions.cpp
-
 .PHONY: modperl_install
 
 install: $(PERLHOOK)
diff --git a/modules/modpython/Makefile.inc b/modules/modpython/Makefile.inc
index 14408403..e9fac52d 100644
--- a/modules/modpython/Makefile.inc
+++ b/modules/modpython/Makefile.inc
@@ -4,11 +4,8 @@ PYTHONCOMMON += -DSWIG_TYPE_TABLE=znc
 PYTHONCOMMON += -Wno-missing-field-initializers -Wno-unused -Wno-shadow
 PYTHONCOMMON += -Wno-missing-declarations -Wno-uninitialized
 modpythonFLAGS := $(PYTHONCOMMON) -I.
-PYTHONHOOK   := modpython_install
-else
-FILES    := $(shell echo $(FILES) | sed -e "s/modpython//")
-endif
 
+PYTHONHOOK   := modpython_install
 CLEAN    += modpython/_znc_core.so modpython/_znc_core.cpp modpython/znc_core.py modpython/znc_core.pyc
 CLEAN    += modpython/swigpyrun.h modpython/znc.pyc modpython/functions.cpp modpython/compiler
 ifneq "$(srcdir)" "."
@@ -16,6 +13,10 @@ ifneq "$(srcdir)" "."
 CLEAN    += modpython/znc.py
 endif
 
+else
+FILES    := $(shell echo $(FILES) | sed -e "s/modpython//")
+endif
+
 .PHONY: modpython_install modpython_compilepyc
 
 install: $(PYTHONHOOK)