Restored 'local' includes for all the ntfsprogs instead of using system includes (e.g. #include "yada.h" instead of #include <ntfs-3g/yada.h>).

ntfsprogs/Makefile.am

@@ -38,7 +38,7 @@ EXTRA_PROGRAMS		+= ntfsrm
 endif
 
 # Set the include path.
-AM_CPPFLAGS		= -I$(top_srcdir)/include/ntfs $(all_includes)
+AM_CPPFLAGS		= -I$(top_srcdir)/include/ntfs -I$(top_srcdir)/include/ntfs-3g $(all_includes)
 
 ntfsfix_SOURCES		= ntfsfix.c utils.c utils.h
 ntfsfix_LDADD		= $(AM_LIBS)

ntfsprogs/cluster.c

@@ -33,10 +33,9 @@
 #include <string.h>
 #endif
 
-#include <ntfs-3g/logging.h>
-
 #include "cluster.h"
 #include "utils.h"
+#include "logging.h"
 
 /**
  * cluster_find

ntfsprogs/cluster.h

@@ -24,8 +24,8 @@
 #ifndef _CLUSTER_H_
 #define _CLUSTER_H_
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/volume.h>
+#include "volume.h"
 
 typedef struct {
 	int x;

ntfsprogs/mkntfs.c

@@ -128,25 +128,24 @@
 #	endif
 #endif
 
-#include <ntfs-3g/security.h>
+#include "security.h"
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/bitmap.h>
+#include "bitmap.h"
-#include <ntfs-3g/bootsect.h>
+#include "bootsect.h"
-#include <ntfs-3g/device.h>
+#include "device.h"
-#include <ntfs-3g/dir.h>
+#include "dir.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/mst.h>
+#include "mst.h"
-#include <ntfs-3g/runlist.h>
+#include "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.  \

ntfsprogs/ntfscat.c

@@ -38,12 +38,12 @@
 #include <string.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/volume.h>
+#include "utils.h"
-#include <ntfs-3g/debug.h>
+#include "volume.h"
-#include <ntfs-3g/dir.h>
+#include "debug.h"
-
+#include "dir.h"
 #include "ntfscat.h"
 /* #include "version.h" */
 #include "utils.h"

ntfsprogs/ntfscat.h

@@ -25,8 +25,8 @@
 #ifndef _NTFSCAT_H_
 #define _NTFSCAT_H_
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
 
 struct options {
 	char		*device;	/* Device/File to work with */

ntfsprogs/ntfsclone.c

@@ -55,23 +55,22 @@
 #include <getopt.h>
 #endif
 
-#include <ntfs-3g/debug.h>
+#include "debug.h"
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/support.h>
+#include "support.h"
-#include <ntfs-3g/endians.h>
+#include "endians.h"
-#include <ntfs-3g/bootsect.h>
+#include "bootsect.h"
-#include <ntfs-3g/device.h>
+#include "device.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/mst.h>
+#include "mst.h"
-#include <ntfs-3g/volume.h>
+#include "volume.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/bitmap.h>
+#include "bitmap.h"
-#include <ntfs-3g/inode.h>
+#include "inode.h"
-#include <ntfs-3g/index.h>
+#include "index.h"
-#include <ntfs-3g/dir.h>
+#include "dir.h"
-#include <ntfs-3g/runlist.h>
+#include "runlist.h"
-#include <ntfs-3g/ntfstime.h>
+#include "ntfstime.h"
-
 #include "utils.h"
 /* #include "version.h" */
 

ntfsprogs/ntfscluster.c

@@ -41,17 +41,16 @@
 #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;

ntfsprogs/ntfscluster.h

@@ -24,8 +24,8 @@
 #ifndef _NTFSCLUSTER_H_
 #define _NTFSCLUSTER_H_
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
 
 enum action {
 	act_none,

ntfsprogs/ntfscp.c

@@ -44,15 +44,14 @@
 #include <unistd.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "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 */

ntfsprogs/ntfsdecrypt.c

@@ -63,14 +63,13 @@
 #include <gnutls/pkcs12.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "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;

ntfsprogs/ntfsdump_logfile.c

@@ -60,18 +60,17 @@
 #include <fcntl.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/endians.h>
+#include "endians.h"
-#include <ntfs-3g/volume.h>
+#include "volume.h"
-#include <ntfs-3g/inode.h>
+#include "inode.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
-#include <ntfs-3g/logfile.h>
+#include "logfile.h"
-#include <ntfs-3g/mst.h>
+#include "mst.h"
-#include <ntfs-3g/logging.h>
-
 #include "utils.h"
 /* #include "version.h" */
+#include "logging.h"
 
 typedef struct {
 	BOOL is_volume;

ntfsprogs/ntfsfix.c

@@ -64,15 +64,14 @@
 #include <getopt.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/device.h>
+#include "device.h"
-#include <ntfs-3g/logfile.h>
+#include "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.  \

ntfsprogs/ntfsinfo.c

@@ -66,18 +66,17 @@
 #include <errno.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
-#include <ntfs-3g/inode.h>
+#include "inode.h"
-#include <ntfs-3g/index.h>
+#include "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";

ntfsprogs/ntfslabel.c

@@ -44,12 +44,11 @@
 #include <getopt.h>
 #endif
 
-#include <ntfs-3g/debug.h>
+#include "debug.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/logging.h>
-
 #include "utils.h"
 /* #include "version.h" */
+#include "logging.h"
 
 static const char *EXEC_NAME = "ntfslabel";
 

ntfsprogs/ntfsls.c

@@ -42,18 +42,17 @@
 #include <string.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
-#include <ntfs-3g/inode.h>
+#include "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";
 

ntfsprogs/ntfsmftalloc.c

@@ -56,16 +56,15 @@
 #	define LLONG_MAX 9223372036854775807LL
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/inode.h>
+#include "inode.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
-#include <ntfs-3g/volume.h>
+#include "volume.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/logging.h>
-
 #include "utils.h"
 /* #include "version.h" */
+#include "logging.h"
 
 static const char *EXEC_NAME = "ntfsmftalloc";
 

ntfsprogs/ntfsmove.c

@@ -37,17 +37,16 @@
 #include <string.h>
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "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;

ntfsprogs/ntfsmove.h

@@ -24,7 +24,7 @@
 #ifndef _NTFSMOVE_H_
 #define _NTFSMOVE_H_
 
-#include <ntfs-3g/types.h>
+#include "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 */

ntfsprogs/ntfsresize.c

@@ -51,19 +51,18 @@
 #include <getopt.h>
 #endif
 
-#include <ntfs-3g/debug.h>
+#include "debug.h"
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/support.h>
+#include "support.h"
-#include <ntfs-3g/endians.h>
+#include "endians.h"
-#include <ntfs-3g/bootsect.h>
+#include "bootsect.h"
-#include <ntfs-3g/device.h>
+#include "device.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/volume.h>
+#include "volume.h"
-#include <ntfs-3g/mft.h>
+#include "mft.h"
-#include <ntfs-3g/bitmap.h>
+#include "bitmap.h"
-#include <ntfs-3g/inode.h>
+#include "inode.h"
-#include <ntfs-3g/runlist.h>
+#include "runlist.h"
-
 #include "utils.h"
 /* #include "version.h" */
 

ntfsprogs/ntfstruncate.c

@@ -58,16 +58,15 @@
 #	define LLONG_MAX 9223372036854775807LL
 #endif
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/attrib.h>
+#include "attrib.h"
-#include <ntfs-3g/inode.h>
+#include "inode.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
-#include <ntfs-3g/volume.h>
+#include "volume.h"
-#include <ntfs-3g/logging.h>
-
 #include "utils.h"
 #include "attrdef.h"
 /* #include "version.h" */
+#include "logging.h"
 
 const char *EXEC_NAME = "ntfstruncate";
 

ntfsprogs/ntfsundelete.c

@@ -73,19 +73,18 @@
 #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";

ntfsprogs/ntfsundelete.h

@@ -24,10 +24,9 @@
 #ifndef _NTFSUNDELETE_H_
 #define _NTFSUNDELETE_H_
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/runlist.h>
-
 #include "list.h"
+#include "runlist.h"
 
 enum optmode {
 	MODE_NONE = 0,

ntfsprogs/ntfswipe.c

@@ -47,16 +47,15 @@
 #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;

ntfsprogs/ntfswipe.h

@@ -24,7 +24,7 @@
 #ifndef _NTFSWIPE_H_
 #define _NTFSWIPE_H_
 
-#include <ntfs-3g/types.h>
+#include "types.h"
 
 enum action {
 	act_info,

ntfsprogs/sd.c

@@ -1,5 +1,5 @@
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
 #include "sd.h"
 
 /**

ntfsprogs/sd.h

@@ -1,7 +1,7 @@
 #ifndef _NTFS_SD_H_
 #define _NTFS_SD_H_
 
-#include <ntfs-3g/types.h>
+#include "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);

ntfsprogs/upcase.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #endif
 
-#include <ntfs-3g/endians.h>
+#include "endians.h"
-#include <ntfs-3g/types.h>
+#include "types.h"
 #include "upcase.h"
 
 /**

ntfsprogs/utils.c

@@ -64,14 +64,13 @@
 #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";

ntfsprogs/utils.h

@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include <ntfs-3g/types.h>
+#include "types.h"
-#include <ntfs-3g/layout.h>
+#include "layout.h"
-#include <ntfs-3g/volume.h>
+#include "volume.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>