diff --git a/ntfsprogs/cluster.c b/ntfsprogs/cluster.c
index d22d8e41..98fdcf42 100644
--- a/ntfsprogs/cluster.c
+++ b/ntfsprogs/cluster.c
@@ -33,9 +33,10 @@
 #include <string.h>
 #endif
 
+#include <ntfs-3g/logging.h>
+
 #include "cluster.h"
 #include "utils.h"
-#include "logging.h"
 
 /**
  * cluster_find
diff --git a/ntfsprogs/cluster.h b/ntfsprogs/cluster.h
index 4bc18276..47d3edd8 100644
--- a/ntfsprogs/cluster.h
+++ b/ntfsprogs/cluster.h
@@ -24,8 +24,8 @@
 #ifndef _CLUSTER_H_
 #define _CLUSTER_H_
 
-#include "types.h"
-#include "volume.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/volume.h>
 
 typedef struct {
 	int x;
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 2a6684f2..b32a223f 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -128,24 +128,25 @@
 #	endif
 #endif
 
-#include "security.h"
-#include "types.h"
-#include "attrib.h"
-#include "bitmap.h"
-#include "bootsect.h"
-#include "device.h"
-#include "dir.h"
-#include "mft.h"
-#include "mst.h"
-#include "runlist.h"
+#include <ntfs-3g/security.h>
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/bitmap.h>
+#include <ntfs-3g/bootsect.h>
+#include <ntfs-3g/device.h>
+#include <ntfs-3g/dir.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/mst.h>
+#include <ntfs-3g/runlist.h>
+#include <ntfs-3g/ntfstime.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
-#include "ntfstime.h"
 #include "sd.h"
 #include "upcase.h"
 #include "boot.h"
 #include "attrdef.h"
 #include "version.h"
-#include "logging.h"
 
 #ifdef NO_NTFS_DEVICE_DEFAULT_IO_OPS
 #error "No default device io operations!  Cannot build mkntfs.  \
diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c
index b744237a..24635620 100644
--- a/ntfsprogs/ntfscat.c
+++ b/ntfsprogs/ntfscat.c
@@ -38,12 +38,12 @@
 #include <string.h>
 #endif
 
-#include "types.h"
-#include "attrib.h"
-#include "utils.h"
-#include "volume.h"
-#include "debug.h"
-#include "dir.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 "ntfscat.h"
 #include "version.h"
 
diff --git a/ntfsprogs/ntfscat.h b/ntfsprogs/ntfscat.h
index 75b2b068..80ed9174 100644
--- a/ntfsprogs/ntfscat.h
+++ b/ntfsprogs/ntfscat.h
@@ -25,8 +25,8 @@
 #ifndef _NTFSCAT_H_
 #define _NTFSCAT_H_
 
-#include "types.h"
-#include "layout.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/layout.h>
 
 struct options {
 	char		*device;	/* Device/File to work with */
diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c
index 2694265c..afb5b41a 100644
--- a/ntfsprogs/ntfsclone.c
+++ b/ntfsprogs/ntfsclone.c
@@ -55,22 +55,23 @@
 #include <getopt.h>
 #endif
 
-#include "debug.h"
-#include "types.h"
-#include "support.h"
-#include "endians.h"
-#include "bootsect.h"
-#include "device.h"
-#include "attrib.h"
-#include "mst.h"
-#include "volume.h"
-#include "mft.h"
-#include "bitmap.h"
-#include "inode.h"
-#include "index.h"
-#include "dir.h"
-#include "runlist.h"
-#include "ntfstime.h"
+#include <ntfs-3g/debug.h>
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/support.h>
+#include <ntfs-3g/endians.h>
+#include <ntfs-3g/bootsect.h>
+#include <ntfs-3g/device.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/mst.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/bitmap.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/index.h>
+#include <ntfs-3g/dir.h>
+#include <ntfs-3g/runlist.h>
+#include <ntfs-3g/ntfstime.h>
+
 #include "utils.h"
 #include "version.h"
 
diff --git a/ntfsprogs/ntfscluster.c b/ntfsprogs/ntfscluster.c
index d7c13f8a..df813706 100644
--- a/ntfsprogs/ntfscluster.c
+++ b/ntfsprogs/ntfscluster.c
@@ -41,16 +41,17 @@
 #include <limits.h>
 #endif
 
+#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/logging.h>
+
 #include "ntfscluster.h"
-#include "types.h"
-#include "attrib.h"
 #include "utils.h"
-#include "volume.h"
-#include "debug.h"
-#include "dir.h"
 #include "cluster.h"
 #include "version.h"
-#include "logging.h"
 
 static const char *EXEC_NAME = "ntfscluster";
 static struct options opts;
diff --git a/ntfsprogs/ntfscluster.h b/ntfsprogs/ntfscluster.h
index fbc6c1d3..68e6ce50 100644
--- a/ntfsprogs/ntfscluster.h
+++ b/ntfsprogs/ntfscluster.h
@@ -24,8 +24,8 @@
 #ifndef _NTFSCLUSTER_H_
 #define _NTFSCLUSTER_H_
 
-#include "types.h"
-#include "layout.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/layout.h>
 
 enum action {
 	act_none,
diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c
index f8e703e3..f6784232 100644
--- a/ntfsprogs/ntfscp.c
+++ b/ntfsprogs/ntfscp.c
@@ -44,14 +44,15 @@
 #include <unistd.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/dir.h>
+#include <ntfs-3g/debug.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
-#include "volume.h"
-#include "dir.h"
-#include "debug.h"
 #include "version.h"
-#include "logging.h"
 
 struct options {
 	char		*device;	/* Device/File to work with */
diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c
index 71a3d3a0..97bb2f00 100644
--- a/ntfsprogs/ntfsfix.c
+++ b/ntfsprogs/ntfsfix.c
@@ -64,14 +64,15 @@
 #include <getopt.h>
 #endif
 
-#include "types.h"
-#include "attrib.h"
-#include "mft.h"
-#include "device.h"
-#include "logfile.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/device.h>
+#include <ntfs-3g/logfile.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
 #include "version.h"
-#include "logging.h"
 
 #ifdef NO_NTFS_DEVICE_DEFAULT_IO_OPS
 #	error "No default device io operations!  Cannot build ntfsfix.  \
diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index 126aff6e..646d4522 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -66,17 +66,18 @@
 #include <errno.h>
 #endif
 
-#include "types.h"
-#include "mft.h"
-#include "attrib.h"
-#include "layout.h"
-#include "inode.h"
-#include "index.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/layout.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/index.h>
+#include <ntfs-3g/security.h>
+#include <ntfs-3g/mst.h>
+#include <ntfs-3g/dir.h>
+#include <ntfs-3g/ntfstime.h>
+
 #include "utils.h"
-#include "security.h"
-#include "mst.h"
-#include "dir.h"
-#include "ntfstime.h"
 #include "version.h"
 
 static const char *EXEC_NAME = "ntfsinfo";
diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c
index f219eb6a..f3d1458a 100644
--- a/ntfsprogs/ntfslabel.c
+++ b/ntfsprogs/ntfslabel.c
@@ -44,11 +44,12 @@
 #include <getopt.h>
 #endif
 
-#include "debug.h"
-#include "mft.h"
+#include <ntfs-3g/debug.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 = "ntfslabel";
 
diff --git a/ntfsprogs/ntfsls.c b/ntfsprogs/ntfsls.c
index 40f291b6..f8b3775f 100644
--- a/ntfsprogs/ntfsls.c
+++ b/ntfsprogs/ntfsls.c
@@ -42,17 +42,18 @@
 #include <string.h>
 #endif
 
-#include "types.h"
-#include "mft.h"
-#include "attrib.h"
-#include "layout.h"
-#include "inode.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/layout.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/dir.h>
+#include <ntfs-3g/ntfstime.h>
+#include <ntfs-3g/logging.h>
+
 #include "utils.h"
-#include "dir.h"
 #include "list.h"
-#include "ntfstime.h"
 #include "version.h"
-#include "logging.h"
 
 static const char *EXEC_NAME = "ntfsls";
 
diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c
index 1ad39cd1..f0d3a4c2 100644
--- a/ntfsprogs/ntfsresize.c
+++ b/ntfsprogs/ntfsresize.c
@@ -51,18 +51,19 @@
 #include <getopt.h>
 #endif
 
-#include "debug.h"
-#include "types.h"
-#include "support.h"
-#include "endians.h"
-#include "bootsect.h"
-#include "device.h"
-#include "attrib.h"
-#include "volume.h"
-#include "mft.h"
-#include "bitmap.h"
-#include "inode.h"
-#include "runlist.h"
+#include <ntfs-3g/debug.h>
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/support.h>
+#include <ntfs-3g/endians.h>
+#include <ntfs-3g/bootsect.h>
+#include <ntfs-3g/device.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/volume.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/bitmap.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/runlist.h>
+
 #include "utils.h"
 #include "version.h"
 
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index b18d149b..bbf8c4b7 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -73,18 +73,19 @@
 #define REG_NOERROR 0
 #endif
 
+#include <ntfs-3g/bootsect.h>
+#include <ntfs-3g/mft.h>
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/layout.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/device.h>
+#include <ntfs-3g/debug.h>
+#include <ntfs-3g/ntfstime.h>
+#include <ntfs-3g/logging.h>
+
 #include "ntfsundelete.h"
-#include "bootsect.h"
-#include "mft.h"
-#include "attrib.h"
-#include "layout.h"
-#include "inode.h"
-#include "device.h"
 #include "utils.h"
-#include "debug.h"
-#include "ntfstime.h"
 #include "version.h"
-#include "logging.h"
 
 static const char *EXEC_NAME = "ntfsundelete";
 static const char *MFTFILE   = "mft";
diff --git a/ntfsprogs/ntfsundelete.h b/ntfsprogs/ntfsundelete.h
index f4b0271a..89daf4b8 100644
--- a/ntfsprogs/ntfsundelete.h
+++ b/ntfsprogs/ntfsundelete.h
@@ -24,9 +24,10 @@
 #ifndef _NTFSUNDELETE_H_
 #define _NTFSUNDELETE_H_
 
-#include "types.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/runlist.h>
+
 #include "list.h"
-#include "runlist.h"
 
 enum optmode {
 	MODE_NONE = 0,
diff --git a/ntfsprogs/sd.c b/ntfsprogs/sd.c
index 0e4ce809..fee2166b 100644
--- a/ntfsprogs/sd.c
+++ b/ntfsprogs/sd.c
@@ -1,5 +1,5 @@
-#include "types.h"
-#include "layout.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/layout.h>
 #include "sd.h"
 
 /**
diff --git a/ntfsprogs/sd.h b/ntfsprogs/sd.h
index aac6b111..d6443ae9 100644
--- a/ntfsprogs/sd.h
+++ b/ntfsprogs/sd.h
@@ -1,7 +1,7 @@
 #ifndef _NTFS_SD_H_
 #define _NTFS_SD_H_
 
-#include "types.h"
+#include <ntfs-3g/types.h>
 
 void init_system_file_sd(int sys_file_no, u8 **sd_val, int *sd_val_len);
 void init_root_sd_31(u8 **sd_val, int *sd_val_len);
diff --git a/ntfsprogs/upcase.c b/ntfsprogs/upcase.c
index 113686cd..f83d27e6 100644
--- a/ntfsprogs/upcase.c
+++ b/ntfsprogs/upcase.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #endif
 
-#include "endians.h"
-#include "types.h"
+#include <ntfs-3g/endians.h>
+#include <ntfs-3g/types.h>
 #include "upcase.h"
 
 /**
diff --git a/ntfsprogs/utils.c b/ntfsprogs/utils.c
index ef432de4..42799a72 100644
--- a/ntfsprogs/utils.c
+++ b/ntfsprogs/utils.c
@@ -64,13 +64,14 @@
 #include <ctype.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/logging.h>
+
 #include "utils.h"
-#include "types.h"
-#include "volume.h"
-#include "debug.h"
-#include "dir.h"
 #include "version.h"
-#include "logging.h"
 
 const char *ntfs_bugs = "Developers' email address: "NTFS_DEV_LIST"\n";
 const char *ntfs_home = "Linux NTFS homepage: http://www.linux-ntfs.org\n";
diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h
index 480b03d0..0fc89883 100644
--- a/ntfsprogs/utils.h
+++ b/ntfsprogs/utils.h
@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include "types.h"
-#include "layout.h"
-#include "volume.h"
+#include <ntfs-3g/types.h>
+#include <ntfs-3g/layout.h>
+#include <ntfs-3g/volume.h>
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>