build: Stop creating the symlinks in include/ on the fly.

Git handles symlinks, tar handles symlinks.  So I've just put the
links themselves into git.

This simplifies dependencies a little, and stop some build loops I was
hitting.

External build dir now works too.

83 files changed, 83 insertions, 103 deletions

diff --git a/include/.gitignore b/include/.gitignore
index 4971e071a..396884bea 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,4 +1,2 @@
-.symlinks
-.symlinks_created
-
-*.h
+configure.h
+lvm-version.h
diff --git a/include/.symlinks.in b/include/.symlinks.in
deleted file mode 100644
index 3d5075058..000000000
--- a/include/.symlinks.in
+++ /dev/null
@@ -1,80 +0,0 @@
-@top_srcdir@/daemons/clvmd/clvm.h
-@top_srcdir@/daemons/dmeventd/libdevmapper-event.h
-@top_srcdir@/daemons/lvmetad/lvmetad-client.h
-@top_srcdir@/daemons/lvmlockd/lvmlockd-client.h
-@top_srcdir@/daemons/lvmpolld/lvmpolld-protocol.h
-@top_srcdir@/daemons/lvmpolld/polling_ops.h
-@top_srcdir@/lib/activate/activate.h
-@top_srcdir@/lib/activate/targets.h
-@top_srcdir@/lib/cache/lvmcache.h
-@top_srcdir@/lib/cache/lvmetad.h
-@top_srcdir@/lib/commands/toolcontext.h
-@top_srcdir@/lib/config/config.h
-@top_srcdir@/lib/config/config_settings.h
-@top_srcdir@/lib/config/defaults.h
-@top_srcdir@/lib/datastruct/btree.h
-@top_srcdir@/lib/datastruct/str_list.h
-@top_srcdir@/lib/device/bcache.h
-@top_srcdir@/lib/device/dev-cache.h
-@top_srcdir@/lib/device/dev-ext-udev-constants.h
-@top_srcdir@/lib/device/dev-type.h
-@top_srcdir@/lib/device/device-types.h
-@top_srcdir@/lib/device/device.h
-@top_srcdir@/lib/display/display.h
-@top_srcdir@/lib/filters/filter.h
-@top_srcdir@/lib/format1/format1.h
-@top_srcdir@/lib/format_pool/format_pool.h
-@top_srcdir@/lib/format_text/archiver.h
-@top_srcdir@/lib/format_text/format-text.h
-@top_srcdir@/lib/format_text/text_export.h
-@top_srcdir@/lib/format_text/text_import.h
-@top_srcdir@/lib/label/label.h
-@top_srcdir@/lib/locking/locking.h
-@top_srcdir@/lib/locking/lvmlockd.h
-@top_srcdir@/lib/log/log.h
-@top_srcdir@/lib/log/lvm-logging.h
-@top_srcdir@/lib/lvmpolld/lvmpolld-client.h
-@top_srcdir@/lib/lvmpolld/polldaemon.h
-@top_srcdir@/lib/metadata/lv.h
-@top_srcdir@/lib/metadata/lv_alloc.h
-@top_srcdir@/lib/metadata/metadata-exported.h
-@top_srcdir@/lib/metadata/metadata.h
-@top_srcdir@/lib/metadata/pv.h
-@top_srcdir@/lib/metadata/pv_alloc.h
-@top_srcdir@/lib/metadata/segtype.h
-@top_srcdir@/lib/metadata/vg.h
-@top_srcdir@/lib/misc/crc.h
-@top_srcdir@/lib/misc/intl.h
-@top_srcdir@/lib/misc/last-path-component.h
-@top_srcdir@/lib/misc/lib.h
-@top_srcdir@/lib/misc/lvm-exec.h
-@top_srcdir@/lib/misc/lvm-file.h
-@top_srcdir@/lib/misc/lvm-flock.h
-@top_srcdir@/lib/misc/lvm-globals.h
-@top_srcdir@/lib/misc/lvm-maths.h
-@top_srcdir@/lib/misc/lvm-percent.h
-@top_srcdir@/lib/misc/lvm-signal.h
-@top_srcdir@/lib/misc/lvm-string.h
-@top_srcdir@/lib/misc/lvm-wrappers.h
-@top_srcdir@/lib/misc/sharedlib.h
-@top_srcdir@/lib/misc/util.h
-@top_srcdir@/lib/mm/memlock.h
-@top_srcdir@/lib/mm/xlate.h
-@top_srcdir@/lib/notify/lvmnotify.h
-@top_srcdir@/lib/properties/prop_common.h
-@top_srcdir@/lib/report/properties.h
-@top_srcdir@/lib/report/report.h
-@top_srcdir@/lib/uuid/uuid.h
-@top_srcdir@/libdaemon/client/config-util.h
-@top_srcdir@/libdaemon/client/daemon-client.h
-@top_srcdir@/libdaemon/client/daemon-io.h
-@top_srcdir@/libdm/libdevmapper.h
-@top_srcdir@/libdm/misc/dm-ioctl.h
-@top_srcdir@/libdm/misc/dm-log-userspace.h
-@top_srcdir@/libdm/misc/dm-logging.h
-@top_srcdir@/libdm/misc/dmlib.h
-@top_srcdir@/libdm/misc/kdev_t.h
-@top_srcdir@/liblvm/lvm2app.h
-@top_srcdir@/po/pogen.h
-@top_srcdir@/tools/lvm2cmd.h
-@top_srcdir@/tools/tool.h
diff --git a/include/Makefile.in b/include/Makefile.in
index b2571fd62..e5c09b58b 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -18,22 +18,4 @@ top_builddir = @top_builddir@
 
 include $(top_builddir)/make.tmpl
 
-all: .symlinks_created
-
-LINKS := $(shell find . -maxdepth 1 -type l)
-
-.symlinks_created: .symlinks
-ifneq (,$(firstword $(LINKS)))
-	$(RM) $(LINKS)
-endif
-	for i in `cat $<`; do $(LN_S) $$i ; done
-	touch $@
-
-pofile: all
-
-device-mapper: all
-
-cflow: all
-
-DISTCLEAN_TARGETS += .symlinks configure.h lvm-version.h
-CLEAN_TARGETS += $(LINKS) .include_symlinks .symlinks_created
+DISTCLEAN_TARGETS += configure.h lvm-version.h
diff --git a/include/activate.h b/include/activate.h
new file mode 120000
index 000000000..3c8d94a5d
--- /dev/null
+++ b/include/activate.h
@@ -0,0 +1 @@
+../lib/activate/activate.h
\ No newline at end of file
diff --git a/include/archiver.h b/include/archiver.h
new file mode 120000
index 000000000..bac9048ba
--- /dev/null
+++ b/include/archiver.h
@@ -0,0 +1 @@
+../lib/format_text/archiver.h
\ No newline at end of file
diff --git a/include/bcache.h b/include/bcache.h
new file mode 120000
index 000000000..5855f8dd8
--- /dev/null
+++ b/include/bcache.h
@@ -0,0 +1 @@
+../lib/device/bcache.h
\ No newline at end of file
diff --git a/include/btree.h b/include/btree.h
new file mode 120000
index 000000000..e45aee473
--- /dev/null
+++ b/include/btree.h
@@ -0,0 +1 @@
+../lib/datastruct/btree.h
\ No newline at end of file
diff --git a/include/clvm.h b/include/clvm.h
new file mode 120000
index 000000000..9740db4dc
--- /dev/null
+++ b/include/clvm.h
@@ -0,0 +1 @@
+../daemons/clvmd/clvm.h
\ No newline at end of file
diff --git a/include/config-util.h b/include/config-util.h
new file mode 120000
index 000000000..4b7b220a6
--- /dev/null
+++ b/include/config-util.h
@@ -0,0 +1 @@
+../libdaemon/client/config-util.h
\ No newline at end of file
diff --git a/include/config.h b/include/config.h
new file mode 120000
index 000000000..a73394239
--- /dev/null
+++ b/include/config.h
@@ -0,0 +1 @@
+../lib/config/config.h
\ No newline at end of file
diff --git a/include/config_settings.h b/include/config_settings.h
new file mode 120000
index 000000000..407d5948f
--- /dev/null
+++ b/include/config_settings.h
@@ -0,0 +1 @@
+../lib/config/config_settings.h
\ No newline at end of file
diff --git a/include/crc.h b/include/crc.h
new file mode 120000
index 000000000..25c761a82
--- /dev/null
+++ b/include/crc.h
@@ -0,0 +1 @@
+../lib/misc/crc.h
\ No newline at end of file
diff --git a/include/daemon-client.h b/include/daemon-client.h
new file mode 120000
index 000000000..7dbf53f23
--- /dev/null
+++ b/include/daemon-client.h
@@ -0,0 +1 @@
+../libdaemon/client/daemon-client.h
\ No newline at end of file
diff --git a/include/daemon-io.h b/include/daemon-io.h
new file mode 120000
index 000000000..79612d9fc
--- /dev/null
+++ b/include/daemon-io.h
@@ -0,0 +1 @@
+../libdaemon/client/daemon-io.h
\ No newline at end of file
diff --git a/include/defaults.h b/include/defaults.h
new file mode 120000
index 000000000..c97f06fd5
--- /dev/null
+++ b/include/defaults.h
@@ -0,0 +1 @@
+../lib/config/defaults.h
\ No newline at end of file
diff --git a/include/dev-cache.h b/include/dev-cache.h
new file mode 120000
index 000000000..edb73957a
--- /dev/null
+++ b/include/dev-cache.h
@@ -0,0 +1 @@
+../lib/device/dev-cache.h
\ No newline at end of file
diff --git a/include/dev-ext-udev-constants.h b/include/dev-ext-udev-constants.h
new file mode 120000
index 000000000..97258ef33
--- /dev/null
+++ b/include/dev-ext-udev-constants.h
@@ -0,0 +1 @@
+../lib/device/dev-ext-udev-constants.h
\ No newline at end of file
diff --git a/include/dev-type.h b/include/dev-type.h
new file mode 120000
index 000000000..8082a7698
--- /dev/null
+++ b/include/dev-type.h
@@ -0,0 +1 @@
+../lib/device/dev-type.h
\ No newline at end of file
diff --git a/include/device-types.h b/include/device-types.h
new file mode 120000
index 000000000..452a6fac2
--- /dev/null
+++ b/include/device-types.h
@@ -0,0 +1 @@
+../lib/device/device-types.h
\ No newline at end of file
diff --git a/include/device.h b/include/device.h
new file mode 120000
index 000000000..ee365d977
--- /dev/null
+++ b/include/device.h
@@ -0,0 +1 @@
+../lib/device/device.h
\ No newline at end of file
diff --git a/include/display.h b/include/display.h
new file mode 120000
index 000000000..b614edea8
--- /dev/null
+++ b/include/display.h
@@ -0,0 +1 @@
+../lib/display/display.h
\ No newline at end of file
diff --git a/include/dm-ioctl.h b/include/dm-ioctl.h
new file mode 120000
index 000000000..4acd5a500
--- /dev/null
+++ b/include/dm-ioctl.h
@@ -0,0 +1 @@
+../libdm/misc/dm-ioctl.h
\ No newline at end of file
diff --git a/include/dm-log-userspace.h b/include/dm-log-userspace.h
new file mode 120000
index 000000000..37c9feadc
--- /dev/null
+++ b/include/dm-log-userspace.h
@@ -0,0 +1 @@
+../libdm/misc/dm-log-userspace.h
\ No newline at end of file
diff --git a/include/dm-logging.h b/include/dm-logging.h
new file mode 120000
index 000000000..2af311e9f
--- /dev/null
+++ b/include/dm-logging.h
@@ -0,0 +1 @@
+../libdm/misc/dm-logging.h
\ No newline at end of file
diff --git a/include/dmlib.h b/include/dmlib.h
new file mode 120000
index 000000000..6e99e605f
--- /dev/null
+++ b/include/dmlib.h
@@ -0,0 +1 @@
+../libdm/misc/dmlib.h
\ No newline at end of file
diff --git a/include/filter.h b/include/filter.h
new file mode 120000
index 000000000..c22ea1698
--- /dev/null
+++ b/include/filter.h
@@ -0,0 +1 @@
+../lib/filters/filter.h
\ No newline at end of file
diff --git a/include/format-text.h b/include/format-text.h
new file mode 120000
index 000000000..ca81b1ddd
--- /dev/null
+++ b/include/format-text.h
@@ -0,0 +1 @@
+../lib/format_text/format-text.h
\ No newline at end of file
diff --git a/include/format1.h b/include/format1.h
new file mode 120000
index 000000000..4e23bc92a
--- /dev/null
+++ b/include/format1.h
@@ -0,0 +1 @@
+../lib/format1/format1.h
\ No newline at end of file
diff --git a/include/format_pool.h b/include/format_pool.h
new file mode 120000
index 000000000..7198a378a
--- /dev/null
+++ b/include/format_pool.h
@@ -0,0 +1 @@
+../lib/format_pool/format_pool.h
\ No newline at end of file
diff --git a/include/intl.h b/include/intl.h
new file mode 120000
index 000000000..6db3a2b4b
--- /dev/null
+++ b/include/intl.h
@@ -0,0 +1 @@
+../lib/misc/intl.h
\ No newline at end of file
diff --git a/include/kdev_t.h b/include/kdev_t.h
new file mode 120000
index 000000000..1d04a7243
--- /dev/null
+++ b/include/kdev_t.h
@@ -0,0 +1 @@
+../libdm/misc/kdev_t.h
\ No newline at end of file
diff --git a/include/label.h b/include/label.h
new file mode 120000
index 000000000..0af47caf6
--- /dev/null
+++ b/include/label.h
@@ -0,0 +1 @@
+../lib/label/label.h
\ No newline at end of file
diff --git a/include/last-path-component.h b/include/last-path-component.h
new file mode 120000
index 000000000..58f8badae
--- /dev/null
+++ b/include/last-path-component.h
@@ -0,0 +1 @@
+../lib/misc/last-path-component.h
\ No newline at end of file
diff --git a/include/lib.h b/include/lib.h
new file mode 120000
index 000000000..912ac0c5a
--- /dev/null
+++ b/include/lib.h
@@ -0,0 +1 @@
+../lib/misc/lib.h
\ No newline at end of file
diff --git a/include/libdevmapper-event.h b/include/libdevmapper-event.h
new file mode 120000
index 000000000..a54561d9f
--- /dev/null
+++ b/include/libdevmapper-event.h
@@ -0,0 +1 @@
+../daemons/dmeventd/libdevmapper-event.h
\ No newline at end of file
diff --git a/include/libdevmapper.h b/include/libdevmapper.h
new file mode 120000
index 000000000..a88009bbc
--- /dev/null
+++ b/include/libdevmapper.h
@@ -0,0 +1 @@
+../libdm/libdevmapper.h
\ No newline at end of file
diff --git a/include/locking.h b/include/locking.h
new file mode 120000
index 000000000..6ea334307
--- /dev/null
+++ b/include/locking.h
@@ -0,0 +1 @@
+../lib/locking/locking.h
\ No newline at end of file
diff --git a/include/log.h b/include/log.h
new file mode 120000
index 000000000..245ac3d73
--- /dev/null
+++ b/include/log.h
@@ -0,0 +1 @@
+../lib/log/log.h
\ No newline at end of file
diff --git a/include/lv.h b/include/lv.h
new file mode 120000
index 000000000..7cd7de6bb
--- /dev/null
+++ b/include/lv.h
@@ -0,0 +1 @@
+../lib/metadata/lv.h
\ No newline at end of file
diff --git a/include/lv_alloc.h b/include/lv_alloc.h
new file mode 120000
index 000000000..bbb691cca
--- /dev/null
+++ b/include/lv_alloc.h
@@ -0,0 +1 @@
+../lib/metadata/lv_alloc.h
\ No newline at end of file
diff --git a/include/lvm-exec.h b/include/lvm-exec.h
new file mode 120000
index 000000000..5b5232a58
--- /dev/null
+++ b/include/lvm-exec.h
@@ -0,0 +1 @@
+../lib/misc/lvm-exec.h
\ No newline at end of file
diff --git a/include/lvm-file.h b/include/lvm-file.h
new file mode 120000
index 000000000..bcb8288e6
--- /dev/null
+++ b/include/lvm-file.h
@@ -0,0 +1 @@
+../lib/misc/lvm-file.h
\ No newline at end of file
diff --git a/include/lvm-flock.h b/include/lvm-flock.h
new file mode 120000
index 000000000..e1ef68253
--- /dev/null
+++ b/include/lvm-flock.h
@@ -0,0 +1 @@
+../lib/misc/lvm-flock.h
\ No newline at end of file
diff --git a/include/lvm-globals.h b/include/lvm-globals.h
new file mode 120000
index 000000000..767f63d78
--- /dev/null
+++ b/include/lvm-globals.h
@@ -0,0 +1 @@
+../lib/misc/lvm-globals.h
\ No newline at end of file
diff --git a/include/lvm-logging.h b/include/lvm-logging.h
new file mode 120000
index 000000000..9236bad44
--- /dev/null
+++ b/include/lvm-logging.h
@@ -0,0 +1 @@
+../lib/log/lvm-logging.h
\ No newline at end of file
diff --git a/include/lvm-maths.h b/include/lvm-maths.h
new file mode 120000
index 000000000..45a0815e7
--- /dev/null
+++ b/include/lvm-maths.h
@@ -0,0 +1 @@
+../lib/misc/lvm-maths.h
\ No newline at end of file
diff --git a/include/lvm-percent.h b/include/lvm-percent.h
new file mode 120000
index 000000000..316057388
--- /dev/null
+++ b/include/lvm-percent.h
@@ -0,0 +1 @@
+../lib/misc/lvm-percent.h
\ No newline at end of file
diff --git a/include/lvm-signal.h b/include/lvm-signal.h
new file mode 120000
index 000000000..d98731128
--- /dev/null
+++ b/include/lvm-signal.h
@@ -0,0 +1 @@
+../lib/misc/lvm-signal.h
\ No newline at end of file
diff --git a/include/lvm-string.h b/include/lvm-string.h
new file mode 120000
index 000000000..f727b1e62
--- /dev/null
+++ b/include/lvm-string.h
@@ -0,0 +1 @@
+../lib/misc/lvm-string.h
\ No newline at end of file
diff --git a/include/lvm-wrappers.h b/include/lvm-wrappers.h
new file mode 120000
index 000000000..424679a93
--- /dev/null
+++ b/include/lvm-wrappers.h
@@ -0,0 +1 @@
+../lib/misc/lvm-wrappers.h
\ No newline at end of file
diff --git a/include/lvm2app.h b/include/lvm2app.h
new file mode 120000
index 000000000..17f2006cb
--- /dev/null
+++ b/include/lvm2app.h
@@ -0,0 +1 @@
+../liblvm/lvm2app.h
\ No newline at end of file
diff --git a/include/lvm2cmd.h b/include/lvm2cmd.h
new file mode 120000
index 000000000..9d273307d
--- /dev/null
+++ b/include/lvm2cmd.h
@@ -0,0 +1 @@
+../tools/lvm2cmd.h
\ No newline at end of file
diff --git a/include/lvmcache.h b/include/lvmcache.h
new file mode 120000
index 000000000..ba1399c15
--- /dev/null
+++ b/include/lvmcache.h
@@ -0,0 +1 @@
+../lib/cache/lvmcache.h
\ No newline at end of file
diff --git a/include/lvmetad-client.h b/include/lvmetad-client.h
new file mode 120000
index 000000000..54b8f1f4b
--- /dev/null
+++ b/include/lvmetad-client.h
@@ -0,0 +1 @@
+../daemons/lvmetad/lvmetad-client.h
\ No newline at end of file
diff --git a/include/lvmetad.h b/include/lvmetad.h
new file mode 120000
index 000000000..65c561cf2
--- /dev/null
+++ b/include/lvmetad.h
@@ -0,0 +1 @@
+../lib/cache/lvmetad.h
\ No newline at end of file
diff --git a/include/lvmlockd-client.h b/include/lvmlockd-client.h
new file mode 120000
index 000000000..23291c263
--- /dev/null
+++ b/include/lvmlockd-client.h
@@ -0,0 +1 @@
+../daemons/lvmlockd/lvmlockd-client.h
\ No newline at end of file
diff --git a/include/lvmlockd.h b/include/lvmlockd.h
new file mode 120000
index 000000000..1fe51a65a
--- /dev/null
+++ b/include/lvmlockd.h
@@ -0,0 +1 @@
+../lib/locking/lvmlockd.h
\ No newline at end of file
diff --git a/include/lvmnotify.h b/include/lvmnotify.h
new file mode 120000
index 000000000..7c624a768
--- /dev/null
+++ b/include/lvmnotify.h
@@ -0,0 +1 @@
+../lib/notify/lvmnotify.h
\ No newline at end of file
diff --git a/include/lvmpolld-client.h b/include/lvmpolld-client.h
new file mode 120000
index 000000000..78de8c649
--- /dev/null
+++ b/include/lvmpolld-client.h
@@ -0,0 +1 @@
+../lib/lvmpolld/lvmpolld-client.h
\ No newline at end of file
diff --git a/include/lvmpolld-protocol.h b/include/lvmpolld-protocol.h
new file mode 120000
index 000000000..5f5ecb52e
--- /dev/null
+++ b/include/lvmpolld-protocol.h
@@ -0,0 +1 @@
+../daemons/lvmpolld/lvmpolld-protocol.h
\ No newline at end of file
diff --git a/include/memlock.h b/include/memlock.h
new file mode 120000
index 000000000..8d9bc4b1a
--- /dev/null
+++ b/include/memlock.h
@@ -0,0 +1 @@
+../lib/mm/memlock.h
\ No newline at end of file
diff --git a/include/metadata-exported.h b/include/metadata-exported.h
new file mode 120000
index 000000000..570ab36b7
--- /dev/null
+++ b/include/metadata-exported.h
@@ -0,0 +1 @@
+../lib/metadata/metadata-exported.h
\ No newline at end of file
diff --git a/include/metadata.h b/include/metadata.h
new file mode 120000
index 000000000..94fbad48d
--- /dev/null
+++ b/include/metadata.h
@@ -0,0 +1 @@
+../lib/metadata/metadata.h
\ No newline at end of file
diff --git a/include/pogen.h b/include/pogen.h
new file mode 120000
index 000000000..972148769
--- /dev/null
+++ b/include/pogen.h
@@ -0,0 +1 @@
+../po/pogen.h
\ No newline at end of file
diff --git a/include/polldaemon.h b/include/polldaemon.h
new file mode 120000
index 000000000..7816b0bd0
--- /dev/null
+++ b/include/polldaemon.h
@@ -0,0 +1 @@
+../lib/lvmpolld/polldaemon.h
\ No newline at end of file
diff --git a/include/polling_ops.h b/include/polling_ops.h
new file mode 120000
index 000000000..4ec0a307e
--- /dev/null
+++ b/include/polling_ops.h
@@ -0,0 +1 @@
+../daemons/lvmpolld/polling_ops.h
\ No newline at end of file
diff --git a/include/prop_common.h b/include/prop_common.h
new file mode 120000
index 000000000..40b570e88
--- /dev/null
+++ b/include/prop_common.h
@@ -0,0 +1 @@
+../lib/properties/prop_common.h
\ No newline at end of file
diff --git a/include/properties.h b/include/properties.h
new file mode 120000
index 000000000..f34e413a5
--- /dev/null
+++ b/include/properties.h
@@ -0,0 +1 @@
+../lib/report/properties.h
\ No newline at end of file
diff --git a/include/pv.h b/include/pv.h
new file mode 120000
index 000000000..dd3267b83
--- /dev/null
+++ b/include/pv.h
@@ -0,0 +1 @@
+../lib/metadata/pv.h
\ No newline at end of file
diff --git a/include/pv_alloc.h b/include/pv_alloc.h
new file mode 120000
index 000000000..2364a8d09
--- /dev/null
+++ b/include/pv_alloc.h
@@ -0,0 +1 @@
+../lib/metadata/pv_alloc.h
\ No newline at end of file
diff --git a/include/report.h b/include/report.h
new file mode 120000
index 000000000..339bf858b
--- /dev/null
+++ b/include/report.h
@@ -0,0 +1 @@
+../lib/report/report.h
\ No newline at end of file
diff --git a/include/segtype.h b/include/segtype.h
new file mode 120000
index 000000000..6b69bfdff
--- /dev/null
+++ b/include/segtype.h
@@ -0,0 +1 @@
+../lib/metadata/segtype.h
\ No newline at end of file
diff --git a/include/sharedlib.h b/include/sharedlib.h
new file mode 120000
index 000000000..dacb59545
--- /dev/null
+++ b/include/sharedlib.h
@@ -0,0 +1 @@
+../lib/misc/sharedlib.h
\ No newline at end of file
diff --git a/include/str_list.h b/include/str_list.h
new file mode 120000
index 000000000..dd91b1d22
--- /dev/null
+++ b/include/str_list.h
@@ -0,0 +1 @@
+../lib/datastruct/str_list.h
\ No newline at end of file
diff --git a/include/targets.h b/include/targets.h
new file mode 120000
index 000000000..a63c09ac2
--- /dev/null
+++ b/include/targets.h
@@ -0,0 +1 @@
+../lib/activate/targets.h
\ No newline at end of file
diff --git a/include/text_export.h b/include/text_export.h
new file mode 120000
index 000000000..4ef5b9619
--- /dev/null
+++ b/include/text_export.h
@@ -0,0 +1 @@
+../lib/format_text/text_export.h
\ No newline at end of file
diff --git a/include/text_import.h b/include/text_import.h
new file mode 120000
index 000000000..33509d31c
--- /dev/null
+++ b/include/text_import.h
@@ -0,0 +1 @@
+../lib/format_text/text_import.h
\ No newline at end of file
diff --git a/include/tool.h b/include/tool.h
new file mode 120000
index 000000000..d8b265123
--- /dev/null
+++ b/include/tool.h
@@ -0,0 +1 @@
+../tools/tool.h
\ No newline at end of file
diff --git a/include/toolcontext.h b/include/toolcontext.h
new file mode 120000
index 000000000..c26097fdd
--- /dev/null
+++ b/include/toolcontext.h
@@ -0,0 +1 @@
+../lib/commands/toolcontext.h
\ No newline at end of file
diff --git a/include/util.h b/include/util.h
new file mode 120000
index 000000000..d9ca6240a
--- /dev/null
+++ b/include/util.h
@@ -0,0 +1 @@
+../lib/misc/util.h
\ No newline at end of file
diff --git a/include/uuid.h b/include/uuid.h
new file mode 120000
index 000000000..1b70f6e53
--- /dev/null
+++ b/include/uuid.h
@@ -0,0 +1 @@
+../lib/uuid/uuid.h
\ No newline at end of file
diff --git a/include/vg.h b/include/vg.h
new file mode 120000
index 000000000..3f705b259
--- /dev/null
+++ b/include/vg.h
@@ -0,0 +1 @@
+../lib/metadata/vg.h
\ No newline at end of file
diff --git a/include/xlate.h b/include/xlate.h
new file mode 120000
index 000000000..4ab1c8370
--- /dev/null
+++ b/include/xlate.h
@@ -0,0 +1 @@
+../lib/mm/xlate.h
\ No newline at end of file