diff --git a/Makefile.am b/Makefile.am
index 7f590194..aa987945 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,9 +19,9 @@ SUBDIRS = macros src $(PLUGINS) $(SERVERTEST)
 
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
-@MAINT@include $(srcdir)/macros/macros.dep
+@MAINT@include macros/macros.dep
 @MAINT@macros/macros.dep: $(srcdir)/macros/Makefile.am
-@MAINT@	cd $(srcdir)/macros && $(MAKE) macros.dep
+@MAINT@	cd macros && $(MAKE) macros.dep
 
 if HAVE_GNOME
 appletdir = $(datadir)/applets/Network
diff --git a/src/common.h b/src/common.h
index f176ea0e..26e3e8c6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -29,7 +29,7 @@
 #ifdef HAVE_POPT_H
 #  include <popt.h>
 #else
-#  include <src/lib-popt/popt.h>
+#  include "lib-popt/popt.h"
 #endif
 
 #ifdef HAVE_UNISTD_H