diff --git a/src/ocpasswd/Makefile.am b/src/ocpasswd/Makefile.am
index 0346978e..da9f17ed 100644
--- a/src/ocpasswd/Makefile.am
+++ b/src/ocpasswd/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(srcdir)/../../gl/ -I$(builddir)/../../gl/ \
 	-I$(srcdir)/ -I$(srcdir)/../ -I$(builddir)/../../ \
-	$(LIBTALLOC_CFLAGS) $(LIBOPTS_CFLAGS) 
+	-I$(builddir) $(LIBTALLOC_CFLAGS) $(LIBOPTS_CFLAGS) 
 
 include ../common.mk
 
diff --git a/src/ocpasswd/ocpasswd.c b/src/ocpasswd/ocpasswd.c
index 0d451a4a..37537837 100644
--- a/src/ocpasswd/ocpasswd.c
+++ b/src/ocpasswd/ocpasswd.c
@@ -31,7 +31,7 @@
 #include <gnutls/crypto.h>	/* for random */
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ocpasswd-args.h>
+#include "args.h"
 
 /* Gnulib portability files. */
 #include <getpass.h>