diff --git a/squashfs-tools/squashfs_swap.h b/squashfs-tools/squashfs_swap.h
index c21e4d7..afdee40 100644
--- a/squashfs-tools/squashfs_swap.h
+++ b/squashfs-tools/squashfs_swap.h
@@ -3,7 +3,7 @@
 /*
  * Squashfs
  *
- * Copyright (c) 2008, 2009, 2010
+ * Copyright (c) 2008, 2009, 2010, 2013
  * Phillip Lougher <phillip@squashfs.org.uk>
  *
  * This program is free software; you can redistribute it and/or
@@ -335,43 +335,43 @@
 #else
 /* little endian architecture, just copy */
 #define SQUASHFS_SWAP_SUPER_BLOCK(s, d)	\
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_super_block))
 #define SQUASHFS_SWAP_DIR_INDEX(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_dir_index))
 #define SQUASHFS_SWAP_BASE_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_base_inode_header))
 #define SQUASHFS_SWAP_IPC_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_ipc_inode_header))
 #define SQUASHFS_SWAP_LIPC_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_lipc_inode_header))
 #define SQUASHFS_SWAP_DEV_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_dev_inode_header))
 #define SQUASHFS_SWAP_LDEV_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_ldev_inode_header))
 #define SQUASHFS_SWAP_SYMLINK_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_symlink_inode_header))
 #define SQUASHFS_SWAP_REG_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_reg_inode_header))
 #define SQUASHFS_SWAP_LREG_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_lreg_inode_header))
 #define SQUASHFS_SWAP_DIR_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_dir_inode_header))
 #define SQUASHFS_SWAP_LDIR_INODE_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_ldir_inode_header))
 #define SQUASHFS_SWAP_DIR_ENTRY(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_dir_entry))
 #define SQUASHFS_SWAP_DIR_HEADER(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_dir_header))
 #define SQUASHFS_SWAP_FRAGMENT_ENTRY(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_fragment_entry))
 #define SQUASHFS_SWAP_XATTR_ENTRY(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_xattr_entry))
 #define SQUASHFS_SWAP_XATTR_VAL(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_xattr_val))
 #define SQUASHFS_SWAP_XATTR_ID(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_xattr_id))
 #define SQUASHFS_SWAP_XATTR_TABLE(s, d) \
-		SQUASHFS_MEMCPY(s, d, sizeof(*(s)))
+		SQUASHFS_MEMCPY(s, d, sizeof(struct squashfs_xattr_table))
 #define SQUASHFS_SWAP_INODE_T(s, d) SQUASHFS_SWAP_LONG_LONGS(s, d, 1)
 #define SQUASHFS_SWAP_FRAGMENT_INDEXES(s, d, n) \
 			SQUASHFS_SWAP_LONG_LONGS(s, d, n)