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

This reverts commit cdcea0bf55c170f538c3ffc114792eb3c993f4ac.

83 files changed, 103 insertions, 83 deletions

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