diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index de4ce315d..75181436e 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -22,6 +22,10 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 
 libdmxconfig_a_SOURCES = $(LIBSRCS)
 
+if NEED_STRLCAT
+libdmxconfig_a_SOURCES += $(top_srcdir)/os/strlcpy.c
+endif
+
 if GLX
 GLX_DEFS = @GL_CFLAGS@
 endif	    
diff --git a/hw/dmx/config/scanner.l b/hw/dmx/config/scanner.l
index cef99d088..f5bb73b41 100644
--- a/hw/dmx/config/scanner.l
+++ b/hw/dmx/config/scanner.l
@@ -39,6 +39,7 @@
 
 #include "dmxparse.h"
 #include "parser.h"
+#include "os.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>