15 files changed, 46 insertions, 46 deletions
diff --git a/lib/misc/crc.c b/lib/misc/crc.c
index aacd82d7b..8dc107f06 100644
--- a/lib/misc/crc.c
+++ b/lib/misc/crc.c
@@ -13,10 +13,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
+#include "lib/misc/lib.h"
 
-#include "crc.h"
-#include "xlate.h"
+#include "lib/misc/crc.h"
+#include "lib/mm/xlate.h"
 
 /* Calculate an endian-independent CRC of supplied buffer */
 #ifndef DEBUG_CRC32
diff --git a/lib/misc/crc_gen.c b/lib/misc/crc_gen.c
index 1ed018651..56f2d25a9 100644
--- a/lib/misc/crc_gen.c
+++ b/lib/misc/crc_gen.c
@@ -15,7 +15,7 @@
 /*
  * Helper program to generate table included in crc.c.
  */
-#include "lib.h"
+#include "lib/misc/lib.h"
 
 int main(int argc, char **argv)
 {
diff --git a/lib/misc/lib.h b/lib/misc/lib.h
index d7fa5c721..13c7110f7 100644
--- a/lib/misc/lib.h
+++ b/lib/misc/lib.h
@@ -78,17 +78,17 @@
 #endif
 
 
-#include "intl.h"
-#include "libdevmapper.h"
-#include "util.h"
+#include "lib/misc/intl.h"
+#include "libdm/libdevmapper.h"
+#include "lib/misc/util.h"
 
 #ifdef DM
-#  include "dm-logging.h"
+#  include "libdm/misc/dm-logging.h"
 #else
-#  include "lvm-logging.h"
-#  include "lvm-globals.h"
-#  include "lvm-wrappers.h"
-#  include "lvm-maths.h"
+#  include "lib/log/lvm-logging.h"
+#  include "lib/misc/lvm-globals.h"
+#  include "lib/misc/lvm-wrappers.h"
+#  include "lib/misc/lvm-maths.h"
 #endif
 
 #include <unistd.h>
diff --git a/lib/misc/lvm-exec.c b/lib/misc/lvm-exec.c
index 190d42665..aea2abbda 100644
--- a/lib/misc/lvm-exec.c
+++ b/lib/misc/lvm-exec.c
@@ -13,11 +13,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "device.h"
-#include "locking.h"
-#include "lvm-exec.h"
-#include "toolcontext.h"
+#include "lib/misc/lib.h"
+#include "lib/device/device.h"
+#include "lib/locking/locking.h"
+#include "lib/misc/lvm-exec.h"
+#include "lib/commands/toolcontext.h"
 
 #include <unistd.h>
 #include <sys/wait.h>
diff --git a/lib/misc/lvm-exec.h b/lib/misc/lvm-exec.h
index 43c5a4242..8db9a354e 100644
--- a/lib/misc/lvm-exec.h
+++ b/lib/misc/lvm-exec.h
@@ -16,7 +16,7 @@
 #ifndef _LVM_EXEC_H
 #define _LVM_EXEC_H
 
-#include "lib.h"
+#include "lib/misc/lib.h"
 
 struct cmd_context;
 
diff --git a/lib/misc/lvm-file.c b/lib/misc/lvm-file.c
index 36caaa715..5c23b0ab1 100644
--- a/lib/misc/lvm-file.c
+++ b/lib/misc/lvm-file.c
@@ -13,8 +13,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "lvm-file.h"
+#include "lib/misc/lib.h"
+#include "lib/misc/lvm-file.h"
 
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/lib/misc/lvm-flock.c b/lib/misc/lvm-flock.c
index 419631314..00d74dea9 100644
--- a/lib/misc/lvm-flock.c
+++ b/lib/misc/lvm-flock.c
@@ -13,11 +13,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "config.h"
-#include "lvm-flock.h"
-#include "lvm-signal.h"
-#include "locking.h"
+#include "lib/misc/lib.h"
+#include "lib/config/config.h"
+#include "lib/misc/lvm-flock.h"
+#include "lib/misc/lvm-signal.h"
+#include "lib/locking/locking.h"
 
 #include <sys/file.h>
 #include <fcntl.h>
diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c
index 994148971..b76ddb9c4 100644
--- a/lib/misc/lvm-globals.c
+++ b/lib/misc/lvm-globals.c
@@ -13,11 +13,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "device.h"
-#include "lvm-string.h"
-#include "defaults.h"
-#include "metadata-exported.h"
+#include "lib/misc/lib.h"
+#include "lib/device/device.h"
+#include "lib/misc/lvm-string.h"
+#include "lib/config/defaults.h"
+#include "lib/metadata/metadata-exported.h"
 
 #include <stdarg.h>
 
diff --git a/lib/misc/lvm-maths.c b/lib/misc/lvm-maths.c
index df3aa0af0..ede073b68 100644
--- a/lib/misc/lvm-maths.c
+++ b/lib/misc/lvm-maths.c
@@ -12,7 +12,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
+#include "lib/misc/lib.h"
 
 /* Greatest common divisor */
 unsigned long gcd(unsigned long n1, unsigned long n2)
diff --git a/lib/misc/lvm-percent.c b/lib/misc/lvm-percent.c
index 30238f3d4..f76ae81aa 100644
--- a/lib/misc/lvm-percent.c
+++ b/lib/misc/lvm-percent.c
@@ -12,8 +12,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "lvm-percent.h"
+#include "lib/misc/lib.h"
+#include "lib/misc/lvm-percent.h"
 
 uint32_t percent_of_extents(uint32_t percents, uint32_t count, int roundup)
 {
diff --git a/lib/misc/lvm-signal.c b/lib/misc/lvm-signal.c
index 8a4ead478..b90a2db81 100644
--- a/lib/misc/lvm-signal.c
+++ b/lib/misc/lvm-signal.c
@@ -13,9 +13,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "lvm-signal.h"
-#include "memlock.h"
+#include "lib/misc/lib.h"
+#include "lib/misc/lvm-signal.h"
+#include "lib/mm/memlock.h"
 
 #include <signal.h>
 
diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
index a2098fd0f..1e9af66b9 100644
--- a/lib/misc/lvm-string.c
+++ b/lib/misc/lvm-string.c
@@ -13,10 +13,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "lvm-string.h"
-#include "metadata-exported.h"
-#include "display.h"
+#include "lib/misc/lib.h"
+#include "lib/misc/lvm-string.h"
+#include "lib/metadata/metadata-exported.h"
+#include "lib/display/display.h"
 
 #include <ctype.h>
 #include <stdarg.h>
diff --git a/lib/misc/lvm-wrappers.c b/lib/misc/lvm-wrappers.c
index e2b14aa10..c36e2cfc7 100644
--- a/lib/misc/lvm-wrappers.c
+++ b/lib/misc/lvm-wrappers.c
@@ -12,7 +12,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
+#include "lib/misc/lib.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/lib/misc/sharedlib.c b/lib/misc/sharedlib.c
index 2532f7960..d59447012 100644
--- a/lib/misc/sharedlib.c
+++ b/lib/misc/sharedlib.c
@@ -13,10 +13,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "lib.h"
-#include "config.h"
-#include "sharedlib.h"
-#include "toolcontext.h"
+#include "lib/misc/lib.h"
+#include "lib/config/config.h"
+#include "lib/misc/sharedlib.h"
+#include "lib/commands/toolcontext.h"
 
 #include <limits.h>
 #include <sys/stat.h>
diff --git a/lib/misc/sharedlib.h b/lib/misc/sharedlib.h
index 825482d92..5ff2dcb52 100644
--- a/lib/misc/sharedlib.h
+++ b/lib/misc/sharedlib.h
@@ -16,7 +16,7 @@
 #ifndef _LVM_SHAREDLIB_H
 #define _LVM_SHAREDLIB_H
 
-#include "config.h"
+#include "lib/config/config.h"
 #include <dlfcn.h>
 
 void get_shared_library_path(struct cmd_context *cmd, const char *libname,