diff --git a/lib/blkid/blkid_types.h b/lib/blkid/blkid_types.h
index a8d7cff..297a69d 100644
--- a/lib/blkid/blkid_types.h
+++ b/lib/blkid/blkid_types.h
@@ -4,8 +4,8 @@
  * also defined the types that we need.
  */
 #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_EXT2_TYPES_H))
-#define _EXT2_TYPES_H
+	!defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H))
+#define _BLKID_TYPES_H
 
 typedef unsigned char __u8;
 typedef __signed__ char __s8;
diff --git a/lib/ext2fs/ext2_types.h b/lib/ext2fs/ext2_types.h
index a8d7cff..0e5ebe6 100644
--- a/lib/ext2fs/ext2_types.h
+++ b/lib/ext2fs/ext2_types.h
@@ -4,7 +4,7 @@
  * also defined the types that we need.
  */
 #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_EXT2_TYPES_H))
+	!defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H))
 #define _EXT2_TYPES_H
 
 typedef unsigned char __u8;
diff --git a/lib/uuid/uuid_types.h b/lib/uuid/uuid_types.h
index a8d7cff..35e5151 100644
--- a/lib/uuid/uuid_types.h
+++ b/lib/uuid/uuid_types.h
@@ -4,8 +4,8 @@
  * also defined the types that we need.
  */
 #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_EXT2_TYPES_H))
-#define _EXT2_TYPES_H
+	!defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H))
+#define _UUID_TYPES_H
 
 typedef unsigned char __u8;
 typedef __signed__ char __s8;
diff --git a/util/android_types.h b/util/android_types.h
index a8d7cff..5f05903 100644
--- a/util/android_types.h
+++ b/util/android_types.h
@@ -4,8 +4,8 @@
  * also defined the types that we need.
  */
 #if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_EXT2_TYPES_H))
-#define _EXT2_TYPES_H
+	!defined(_EXT2_TYPES_H) && !defined(_UUID_TYPES_H))
+#define _LINUX_TYPES_H
 
 typedef unsigned char __u8;
 typedef __signed__ char __s8;
diff --git a/util/gen-android-files b/util/gen-android-files
index 937496b..cab4e8d 100755
--- a/util/gen-android-files
+++ b/util/gen-android-files
@@ -37,9 +37,16 @@
 
 cp lib/blkid/blkid.h.in lib/blkid/blkid.h
 cp lib/uuid/uuid.h.in lib/uuid/uuid.h
+
 cp util/android_types.h lib/ext2fs/ext2_types.h
 cp util/android_types.h lib/blkid/blkid_types.h
 cp util/android_types.h lib/uuid/uuid_types.h
+# Copied header files having exactly same content results in debug output
+# differences on RBE. Hence modify the #define's appropriately.
+sed -i 's/#define _LINUX_TYPES_H/#define _BLKID_TYPES_H/g' lib/blkid/blkid_types.h
+sed -i 's/#define _LINUX_TYPES_H/#define _EXT2_TYPES_H/g' lib/ext2fs/ext2_types.h
+sed -i 's/#define _LINUX_TYPES_H/#define _UUID_TYPES_H/g' lib/uuid/uuid_types.h
+
 cp util/android_config.h lib/config.h
 cp misc/e2freefrag.c debugfs/
 cp e2fsck/recovery.c e2fsck/revoke.c debugfs/