diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index c8ec43544..9e837b538 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -59,7 +59,37 @@ test_auxval_SOURCES = test-auxval.c
 test_getuserinfo_SOURCES = test-getuserinfo.c
 test_getuserinfo_LDADD = libtest.la $(LDADD)
 
-rkvis_SOURCES = vis.c
+if have_err_h
+err_h =
+else
+err_h = err.h
+endif
+
+if have_fnmatch_h
+fnmatch_h =
+else
+fnmatch_h = fnmatch.h
+endif
+
+if have_ifaddrs_h
+ifaddrs_h =
+else
+ifaddrs_h = ifaddrs.h
+endif
+
+if have_search_h
+search_h = 
+else
+search_h = search.h
+endif
+
+if have_vis_h
+vis_h = 
+else
+vis_h = vis.h
+endif
+
+rkvis_SOURCES = vis.c $(vis_h)
 rkvis_CPPFLAGS = -DTEST
 
 rkbase32_SOURCES = base32.c
@@ -148,6 +178,7 @@ libroken_la_SOURCES =		\
 	tm2time.c		\
 	unvis.c			\
 	vis.c			\
+	$(vis_h)		\
 	warnerr.c		\
 	write_pid.c		\
 	xfree.c			\
@@ -164,37 +195,7 @@ libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt) $(LIB_pidfile)
 
 $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS)
 
-BUILT_SOURCES = roken.h
-
-if have_err_h
-err_h =
-else
-err_h = err.h
-endif
-
-if have_fnmatch_h
-fnmatch_h =
-else
-fnmatch_h = fnmatch.h
-endif
-
-if have_ifaddrs_h
-ifaddrs_h =
-else
-ifaddrs_h = ifaddrs.h
-endif
-
-if have_search_h
-search_h = 
-else
-search_h = search.h
-endif
-
-if have_vis_h
-vis_h = 
-else
-vis_h = vis.h
-endif
+BUILT_SOURCES = roken.h $(err_h) $(fnmatch_h) $(ifadds_h) $(search_h) $(vin_h)
 
 ## these are controlled by configure
 XHEADERS = $(err_h) $(fnmatch_h) $(ifaddrs_h) $(search_h) $(vis_h)