diff --git a/Makefile.am b/Makefile.am
index 46e96637f..3189c0a63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ kpathsea = kpathsea/kpathsea.a
 # just set the variable
 APPSDIR = $(kde_appsdir)/Graphics
 # set the include path for X, qt and KDE
-INCLUDES= @all_includes@ -Ikpathsea
+INCLUDES= $(all_includes) -Ikpathsea
 # claim, which subdirectories you want to install
 SUBDIRS = doc pix
 
@@ -81,6 +81,9 @@ uninstall-local:
 	-rm -f $(kde_icondir)/kdvi.xpm
 	-rm -f $(kde_minidir)/kdvi.xpm
 
+clean-local:
+	(cd kpathsea && test -r Makefile && $(MAKE) distclean)
+
 distclean-local:
 	(cd kpathsea && test -r config.status && $(MAKE) distclean)