diff --git a/quota.c b/quota.c
index 99f9777..c8d51c6 100644
--- a/quota.c
+++ b/quota.c
@@ -36,82 +36,17 @@
 #define QCMD_CMD(cmd)	((u_int32_t)(cmd) >> SUBCMDSHIFT)
 #define QCMD_TYPE(cmd)	((u_int32_t)(cmd) & SUBCMDMASK)
 
-#define OLD_CMD(cmd)	((u_int32_t)(cmd) << 8)
+#define OLD_CMD(cmd)	((u_int32_t)(cmd) << SUBCMDSHIFT)
 #define NEW_CMD(cmd)	((u_int32_t)(cmd) | 0x800000)
-#define XQM_CMD(cmd)	((u_int32_t)(cmd) | ('X'<<8))
-
-#define Q_V1_QUOTAON	OLD_CMD(0x1)
-#define Q_V1_QUOTAOFF	OLD_CMD(0x2)
-#define Q_V1_GETQUOTA	OLD_CMD(0x3)
-#define Q_V1_SETQUOTA	OLD_CMD(0x4)
-#define Q_V1_SETUSE	OLD_CMD(0x5)
-#define Q_V1_SYNC	OLD_CMD(0x6)
-#define Q_SETQLIM	OLD_CMD(0x7)
-#define Q_V1_GETSTATS	OLD_CMD(0x8)
-#define Q_V1_RSQUASH	OLD_CMD(0x10)
-
-#define Q_V2_GETQUOTA	OLD_CMD(0xD)
-#define Q_V2_SETQUOTA	OLD_CMD(0xE)
-#define Q_V2_SETUSE	OLD_CMD(0xF)
-#define Q_V2_GETINFO	OLD_CMD(0x9)
-#define Q_V2_SETINFO	OLD_CMD(0xA)
-#define Q_V2_SETGRACE	OLD_CMD(0xB)
-#define Q_V2_SETFLAGS	OLD_CMD(0xC)
-#define Q_V2_GETSTATS	OLD_CMD(0x11)
-
-#define Q_SYNC		NEW_CMD(0x1)
-#define Q_QUOTAON	NEW_CMD(0x2)
-#define Q_QUOTAOFF	NEW_CMD(0x3)
-#define Q_GETFMT	NEW_CMD(0x4)
-#define Q_GETINFO	NEW_CMD(0x5)
-#define Q_SETINFO	NEW_CMD(0x6)
-#define Q_GETQUOTA	NEW_CMD(0x7)
-#define Q_SETQUOTA	NEW_CMD(0x8)
-
-#define Q_XQUOTAON	XQM_CMD(0x1)
-#define Q_XQUOTAOFF	XQM_CMD(0x2)
-#define Q_XGETQUOTA	XQM_CMD(0x3)
-#define Q_XSETQLIM	XQM_CMD(0x4)
-#define Q_XGETQSTAT	XQM_CMD(0x5)
-#define Q_XQUOTARM	XQM_CMD(0x6)
-#define Q_XQUOTASYNC	XQM_CMD(0x7)
+#define XQM_CMD(cmd)	((u_int32_t)(cmd) | ('X' << SUBCMDSHIFT))
 
 #include "xlat/quotacmds.h"
-
-#define USRQUOTA 0
-#define GRPQUOTA 1
-
 #include "xlat/quotatypes.h"
-
-/* Quota format identifiers */
-#define QFMT_VFS_OLD 1
-#define QFMT_VFS_V0  2
-
 #include "xlat/quota_formats.h"
-
-#define XFS_QUOTA_UDQ_ACCT	(1<<0)	/* user quota accounting */
-#define XFS_QUOTA_UDQ_ENFD	(1<<1)	/* user quota limits enforcement */
-#define XFS_QUOTA_GDQ_ACCT	(1<<2)	/* group quota accounting */
-#define XFS_QUOTA_GDQ_ENFD	(1<<3)	/* group quota limits enforcement */
-
-#define XFS_USER_QUOTA		(1<<0)	/* user quota type */
-#define XFS_PROJ_QUOTA		(1<<1)	/* (IRIX) project quota type */
-#define XFS_GROUP_QUOTA		(1<<2)	/* group quota type */
-
 #include "xlat/xfs_quota_flags.h"
 #include "xlat/xfs_dqblk_flags.h"
-
-/*
- * Following flags are used to specify which fields are valid
- */
-#define QIF_BLIMITS	1
-#define QIF_SPACE	2
-#define QIF_ILIMITS	4
-#define QIF_INODES	8
-#define QIF_BTIME	16
-#define QIF_ITIME	32
-
 #include "xlat/if_dqblk_valid.h"
+#include "xlat/if_dqinfo_valid.h"
 
 struct if_dqblk
 {
@@ -176,15 +111,6 @@
 	char    d_padding4[8];	/* yet more padding */
 };
 
-/*
- * Following flags are used to specify which fields are valid
- */
-#define IIF_BGRACE	1
-#define IIF_IGRACE	2
-#define IIF_FLAGS	4
-
-#include "xlat/if_dqinfo_valid.h"
-
 struct if_dqinfo
 {
 	u_int64_t dqi_bgrace;
diff --git a/xlat/if_dqblk_valid.in b/xlat/if_dqblk_valid.in
index 05993cb..2b3ea54 100644
--- a/xlat/if_dqblk_valid.in
+++ b/xlat/if_dqblk_valid.in
@@ -1,6 +1,6 @@
-QIF_BLIMITS
-QIF_SPACE
-QIF_ILIMITS
-QIF_INODES
-QIF_BTIME
-QIF_ITIME
+QIF_BLIMITS	(1 << 0)
+QIF_SPACE	(1 << 1)
+QIF_ILIMITS	(1 << 2)
+QIF_INODES	(1 << 3)
+QIF_BTIME	(1 << 4)
+QIF_ITIME	(1 << 5)
diff --git a/xlat/if_dqinfo_valid.in b/xlat/if_dqinfo_valid.in
index 9e9fc3d..7d6eca6 100644
--- a/xlat/if_dqinfo_valid.in
+++ b/xlat/if_dqinfo_valid.in
@@ -1,3 +1,3 @@
-IIF_BGRACE
-IIF_IGRACE
-IIF_FLAGS
+IIF_BGRACE	(1 << 0)
+IIF_IGRACE	(1 << 1)
+IIF_FLAGS	(1 << 2)
diff --git a/xlat/quota_formats.in b/xlat/quota_formats.in
index c02687d..470df46 100644
--- a/xlat/quota_formats.in
+++ b/xlat/quota_formats.in
@@ -1,2 +1,2 @@
-QFMT_VFS_OLD
-QFMT_VFS_V0
+QFMT_VFS_OLD	1
+QFMT_VFS_V0	2
diff --git a/xlat/quotacmds.in b/xlat/quotacmds.in
index bb5de01..e40ac9b 100644
--- a/xlat/quotacmds.in
+++ b/xlat/quotacmds.in
@@ -1,32 +1,35 @@
-Q_V1_QUOTAON
-Q_V1_QUOTAOFF
-Q_V1_GETQUOTA
-Q_V1_SETQUOTA
-Q_V1_SETUSE
-Q_V1_SYNC
-Q_SETQLIM
-Q_V1_GETSTATS
-Q_V1_RSQUASH
-Q_V2_GETQUOTA
-Q_V2_SETQUOTA
-Q_V2_SETUSE
-Q_V2_GETINFO
-Q_V2_SETINFO
-Q_V2_SETGRACE
-Q_V2_SETFLAGS
-Q_V2_GETSTATS
-Q_SYNC
-Q_QUOTAON
-Q_QUOTAOFF
-Q_GETFMT
-Q_GETINFO
-Q_SETINFO
-Q_GETQUOTA
-Q_SETQUOTA
-Q_XQUOTAON
-Q_XQUOTAOFF
-Q_XGETQUOTA
-Q_XSETQLIM
-Q_XGETQSTAT
-Q_XQUOTARM
-Q_XQUOTASYNC
+Q_V1_QUOTAON	OLD_CMD(0x1)
+Q_V1_QUOTAOFF	OLD_CMD(0x2)
+Q_V1_GETQUOTA	OLD_CMD(0x3)
+Q_V1_SETQUOTA	OLD_CMD(0x4)
+Q_V1_SETUSE	OLD_CMD(0x5)
+Q_V1_SYNC	OLD_CMD(0x6)
+Q_SETQLIM	OLD_CMD(0x7)
+Q_V1_GETSTATS	OLD_CMD(0x8)
+Q_V1_RSQUASH	OLD_CMD(0x10)
+
+Q_V2_GETQUOTA	OLD_CMD(0xD)
+Q_V2_SETQUOTA	OLD_CMD(0xE)
+Q_V2_SETUSE	OLD_CMD(0xF)
+Q_V2_GETINFO	OLD_CMD(0x9)
+Q_V2_SETINFO	OLD_CMD(0xA)
+Q_V2_SETGRACE	OLD_CMD(0xB)
+Q_V2_SETFLAGS	OLD_CMD(0xC)
+Q_V2_GETSTATS	OLD_CMD(0x11)
+
+Q_SYNC		NEW_CMD(0x1)
+Q_QUOTAON	NEW_CMD(0x2)
+Q_QUOTAOFF	NEW_CMD(0x3)
+Q_GETFMT	NEW_CMD(0x4)
+Q_GETINFO	NEW_CMD(0x5)
+Q_SETINFO	NEW_CMD(0x6)
+Q_GETQUOTA	NEW_CMD(0x7)
+Q_SETQUOTA	NEW_CMD(0x8)
+
+Q_XQUOTAON	XQM_CMD(0x1)
+Q_XQUOTAOFF	XQM_CMD(0x2)
+Q_XGETQUOTA	XQM_CMD(0x3)
+Q_XSETQLIM	XQM_CMD(0x4)
+Q_XGETQSTAT	XQM_CMD(0x5)
+Q_XQUOTARM	XQM_CMD(0x6)
+Q_XQUOTASYNC	XQM_CMD(0x7)
diff --git a/xlat/quotatypes.in b/xlat/quotatypes.in
index 26e77bd..00c81df 100644
--- a/xlat/quotatypes.in
+++ b/xlat/quotatypes.in
@@ -1,2 +1,2 @@
-USRQUOTA
-GRPQUOTA
+USRQUOTA 0
+GRPQUOTA 1
diff --git a/xlat/xfs_dqblk_flags.in b/xlat/xfs_dqblk_flags.in
index 3128e17..c3277bb 100644
--- a/xlat/xfs_dqblk_flags.in
+++ b/xlat/xfs_dqblk_flags.in
@@ -1,3 +1,3 @@
-XFS_USER_QUOTA
-XFS_PROJ_QUOTA
-XFS_GROUP_QUOTA
+XFS_USER_QUOTA	(1<<0)
+XFS_PROJ_QUOTA	(1<<1)
+XFS_GROUP_QUOTA	(1<<2)
diff --git a/xlat/xfs_quota_flags.in b/xlat/xfs_quota_flags.in
index b9a53f0..3f11dc7 100644
--- a/xlat/xfs_quota_flags.in
+++ b/xlat/xfs_quota_flags.in
@@ -1,4 +1,4 @@
-XFS_QUOTA_UDQ_ACCT
-XFS_QUOTA_UDQ_ENFD
-XFS_QUOTA_GDQ_ACCT
-XFS_QUOTA_GDQ_ENFD
+XFS_QUOTA_UDQ_ACCT	(1<<0)
+XFS_QUOTA_UDQ_ENFD	(1<<1)
+XFS_QUOTA_GDQ_ACCT	(1<<2)
+XFS_QUOTA_GDQ_ENFD	(1<<3)