diff --git a/libntfs/win32_io.c b/libntfs/win32_io.c
index 97121a76..01325a04 100644
--- a/libntfs/win32_io.c
+++ b/libntfs/win32_io.c
@@ -71,10 +71,10 @@ static LPFN_FINDVOLUMECLOSE fnFindVolumeClose = NULL;
 
 typedef struct win32_fd {
 	HANDLE handle;
+	int part_hidden_sectors;
 	s64 part_start;
 	s64 part_end;
 	LARGE_INTEGER current_pos;
-	int part_hidden_sectors;
 } win32_fd;
 
 #ifdef EMULATE_SETFILEPOINTEREX
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 87583dc1..341a313f 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -159,11 +159,6 @@ ntfs_volume *vol;
 char *dev_name;
 
 struct {
-	int sector_size;		/* -s, in bytes, power of 2, default is
-					   512 bytes. */
-	int sectors_per_track;		/* number of sectors per track on
-					   device */
-	int heads;			/* number of heads on device */
 	long long part_start_sect;	/* start sector of partition on parent
 					   device */
 	long long nr_sectors;		/* size of device in sectors */
@@ -179,27 +174,32 @@ struct {
 	long long logfile_lcn;		/* lcn of $LogFile, $DATA. */
 	int logfile_size;		/* in bytes, determined from
 					   volume_size. */
-	char mft_zone_multiplier;	/* -z, value from 1 to 4. Default is
+	int mft_zone_multiplier;	/* -z, value from 1 to 4. Default is 
 					   1. */
 	long long mft_zone_end;		/* Determined from volume_size and
 					   mft_zone_multiplier, in clusters. */
-	char no_action;			/* -n, do not write to device, only
-					   display what would be done. */
-	char check_bad_blocks;		/* read-only test for bad
-					   clusters. */
-	long long *bad_blocks;		/* Array of bad clusters. */
 	long long nr_bad_blocks;	/* Number of bad clusters. */
+	long long *bad_blocks;		/* Array of bad clusters. */
 	char *bad_blocks_filename;	/* filename, file to read list of
 					   bad clusters from. */
 	ATTR_DEF *attr_defs;		/* filename, attribute defs. */
 	int attr_defs_len;		/* in bytes */
 	ntfschar *upcase;		/* filename, upcase table. */
 	u32 upcase_len;			/* Determined automatically. */
+	int sector_size;		/* -s, in bytes, power of 2, default is
+					   512 bytes. */
+	int sectors_per_track;		/* number of sectors per track on
+					   device */
+	int heads;			/* number of heads on device */
 	int quiet;			/* -q, quiet execution. */
 	int verbose;			/* -v, verbose execution, given twice,
 					 * really verbose execution (debug
 					 * mode). */
 	int force;			/* -F, force fs creation. */
+	int no_action;			/* -n, do not write to device, only
+					   display what would be done. */
+	char check_bad_blocks;		/* read-only test for bad
+					   clusters. */
 	char quick_format;		/* -f or -Q, fast format, don't zero
 					   the volume first. */
 	char enable_compression;	/* -C, enables compression of all files
diff --git a/ntfsprogs/ntfscat.h b/ntfsprogs/ntfscat.h
index f93b4691..a69df80c 100644
--- a/ntfsprogs/ntfscat.h
+++ b/ntfsprogs/ntfscat.h
@@ -31,8 +31,8 @@
 struct options {
 	char		*device;	/* Device/File to work with */
 	char		*file;		/* File to display */
-	ATTR_TYPES	 attr;		/* Attribute type to display */
 	s64		 inode;		/* Inode to work with */
+	ATTR_TYPES	 attr;		/* Attribute type to display */
 	int		 force;		/* Override common sense */
 	int		 quiet;		/* Less output */
 	int		 verbose;	/* Extra output */
diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h
index ac8a8060..480b7538 100644
--- a/ntfsprogs/utils.h
+++ b/ntfsprogs/utils.h
@@ -125,8 +125,8 @@ struct mft_search_ctx {
 	int flags_search;
 	int flags_match;
 	ntfs_inode *inode;
-	u64 mft_num;
 	ntfs_volume *vol;
+	u64 mft_num;
 };
 
 struct mft_search_ctx * mft_get_search_ctx (ntfs_volume *vol);