--- a/components/isc-dhcp/dhcp.p5m	Fri Jul 17 13:52:51 2015 -0700
+++ b/components/isc-dhcp/dhcp.p5m	Fri Jul 17 15:17:33 2015 -0700
@@ -40,10 +40,26 @@
 file isc-dhcp-server.xml \
     path=lib/svc/manifest/network/dhcp/isc-dhcp-server.xml group=sys mode=0444
 file isc-dhcp path=lib/svc/method/isc-dhcp mode=0555
-file dhcpctl/dhcpctl.h path=usr/include/isc-dhcp/dhcpctl.h
-file includes/isc-dhcp/dst.h path=usr/include/isc-dhcp/dst.h
-file includes/omapip/omapip.h path=usr/include/isc-dhcp/omapip.h
-file includes/omapip/trace.h path=usr/include/isc-dhcp/trace.h
+file path=usr/include/dhcpctl/dhcpctl.h
+file path=usr/include/isc-dhcp/boolean.h
+file path=usr/include/isc-dhcp/commandline.h
+file path=usr/include/isc-dhcp/dst.h
+file path=usr/include/isc-dhcp/formatcheck.h
+file path=usr/include/isc-dhcp/int.h
+file path=usr/include/isc-dhcp/lang.h
+file path=usr/include/isc-dhcp/list.h
+file path=usr/include/isc-dhcp/mem.h
+file path=usr/include/isc-dhcp/print.h
+file path=usr/include/isc-dhcp/result.h
+file path=usr/include/isc-dhcp/string.h
+file path=usr/include/isc-dhcp/types.h
+file path=usr/include/omapip/alloc.h
+file path=usr/include/omapip/buffer.h
+file path=usr/include/omapip/convert.h
+file path=usr/include/omapip/hash.h
+file path=usr/include/omapip/omapip.h
+file path=usr/include/omapip/omapip_p.h
+file path=usr/include/omapip/trace.h
 link path=usr/lib/$(MACH64)/libdhcpctl.so target=libdhcpctl.so.1
 file path=usr/lib/$(MACH64)/libdhcpctl.so.1
 link path=usr/lib/$(MACH64)/libdst.so target=libdst.so.1

--- a/components/isc-dhcp/llib-lomapi	Fri Jul 17 13:52:51 2015 -0700
+++ b/components/isc-dhcp/llib-lomapi	Fri Jul 17 15:17:33 2015 -0700
@@ -31,3 +31,9 @@
 #include <config.h>
 #include <omapip/omapip.h>
 #include <omapip/trace.h>
+#include <isc-dhcp/result.h>
+#include <isc-dhcp/boolean.h>
+#include <isc-dhcp/lang.h>
+#include <isc-dhcp/list.h>
+#include <isc-dhcp/types.h>
+#include <isc-dhcp/int.h>