diff --git a/ntfsprogs/ntfsdecrypt.c b/ntfsprogs/ntfsdecrypt.c
index 43c45861..d5afc5f2 100644
--- a/ntfsprogs/ntfsdecrypt.c
+++ b/ntfsprogs/ntfsdecrypt.c
@@ -63,13 +63,14 @@
 #include <gnutls/pkcs12.h>
 #endif
 
-#include "types.h"
-#include "attrib.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/debug.h>
+#include <ntfs-3g/dir.h>
+#include <ntfs-3g/layout.h>
+
 #include "utils.h"
-#include "volume.h"
-#include "debug.h"
-#include "dir.h"
-#include "layout.h"
 #include "version.h"
 
 typedef gcry_sexp_t ntfs_rsa_private_key;
diff --git a/ntfsprogs/ntfsdump_logfile.c b/ntfsprogs/ntfsdump_logfile.c
index 08568cf1..2f62a176 100644
--- a/ntfsprogs/ntfsdump_logfile.c
+++ b/ntfsprogs/ntfsdump_logfile.c
@@ -60,17 +60,18 @@
 #include <fcntl.h>
 #endif
 
-#include "types.h"
-#include "endians.h"
-#include "volume.h"
-#include "inode.h"
-#include "attrib.h"
-#include "layout.h"
-#include "logfile.h"
-#include "mst.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/endians.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/layout.h>
+#include <ntfs-3g/logfile.h>
+#include <ntfs-3g/mst.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
 #include "version.h"
-#include "logging.h"
 
 typedef struct {
 	BOOL is_volume;
diff --git a/ntfsprogs/ntfsmftalloc.c b/ntfsprogs/ntfsmftalloc.c
index 49ceb17e..11a3390a 100644
--- a/ntfsprogs/ntfsmftalloc.c
+++ b/ntfsprogs/ntfsmftalloc.c
@@ -56,15 +56,16 @@
 #	define LLONG_MAX 9223372036854775807LL
 #endif
 
-#include "types.h"
-#include "attrib.h"
-#include "inode.h"
-#include "layout.h"
-#include "volume.h"
-#include "mft.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/layout.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
 #include "version.h"
-#include "logging.h"
 
 static const char *EXEC_NAME = "ntfsmftalloc";
 
diff --git a/ntfsprogs/ntfsmove.c b/ntfsprogs/ntfsmove.c
index 93ff7a8b..fff2ba48 100644
--- a/ntfsprogs/ntfsmove.c
+++ b/ntfsprogs/ntfsmove.c
@@ -37,16 +37,17 @@
 #include <string.h>
 #endif
 
-#include "types.h"
-#include "attrib.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/debug.h>
+#include <ntfs-3g/dir.h>
+#include <ntfs-3g/bitmap.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
-#include "volume.h"
-#include "debug.h"
-#include "dir.h"
-#include "bitmap.h"
 #include "ntfsmove.h"
 #include "version.h"
-#include "logging.h"
 
 static const char *EXEC_NAME = "ntfsmove";
 static struct options opts;
diff --git a/ntfsprogs/ntfsmove.h b/ntfsprogs/ntfsmove.h
index 1aeeef2a..a698bc9a 100644
--- a/ntfsprogs/ntfsmove.h
+++ b/ntfsprogs/ntfsmove.h
@@ -24,7 +24,7 @@
 #ifndef _NTFSMOVE_H_
 #define _NTFSMOVE_H_
 
-#include "types.h"
+#include <ntfs-3g/types.h>
 					/* Move files to */
 #define NTFS_MOVE_LOC_START	-1000	/*   the first available space */
 #define NTFS_MOVE_LOC_BEST	-1001	/*   place big enough for entire file */
diff --git a/ntfsprogs/ntfstruncate.c b/ntfsprogs/ntfstruncate.c
index 647bb2d7..d6aeb659 100644
--- a/ntfsprogs/ntfstruncate.c
+++ b/ntfsprogs/ntfstruncate.c
@@ -58,15 +58,16 @@
 #	define LLONG_MAX 9223372036854775807LL
 #endif
 
-#include "types.h"
-#include "attrib.h"
-#include "inode.h"
-#include "layout.h"
-#include "volume.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/layout.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
 #include "attrdef.h"
 #include "version.h"
-#include "logging.h"
 
 const char *EXEC_NAME = "ntfstruncate";
 
diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c
index 42ff7d0e..bdc67995 100644
--- a/ntfsprogs/ntfswipe.c
+++ b/ntfsprogs/ntfswipe.c
@@ -47,15 +47,16 @@
 #include <unistd.h>
 #endif
 
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/debug.h>
+#include <ntfs-3g/dir.h>
+#include <ntfs-3g/mst.h>
+#include <ntfs-3g/logging.h>
+
 #include "ntfswipe.h"
-#include "types.h"
-#include "volume.h"
 #include "utils.h"
-#include "debug.h"
-#include "dir.h"
-#include "mst.h"
 #include "version.h"
-#include "logging.h"
 
 static const char *EXEC_NAME = "ntfswipe";
 static struct options opts;
diff --git a/ntfsprogs/ntfswipe.h b/ntfsprogs/ntfswipe.h
index d9de8017..1e7c937e 100644
--- a/ntfsprogs/ntfswipe.h
+++ b/ntfsprogs/ntfswipe.h
@@ -24,7 +24,7 @@
 #ifndef _NTFSWIPE_H_
 #define _NTFSWIPE_H_
 
-#include "types.h"
+#include <ntfs-3g/types.h>
 
 enum action {
 	act_info,