diff --git a/blkid_types-wrapper.h b/blkid_types-wrapper.h
deleted file mode 100644
index a6d4dea..0000000
--- a/blkid_types-wrapper.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This file is here to prevent a file conflict on multiarch systems. A
- * conflict will occur because blkid_types.h has arch-specific definitions.
- *
- * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
-
-#if defined(__i386__)
-#include "blkid_types-i386.h"
-#elif defined(__powerpc64__)
-#include "blkid_types-ppc64.h"
-#elif defined(__powerpc__)
-#include "blkid_types-ppc.h"
-#elif defined(__s390x__)
-#include "blkid_types-s390x.h"
-#elif defined(__s390__)
-#include "blkid_types-s390.h"
-#elif defined(__x86_64__)
-#include "blkid_types-x86_64.h"
-#elif defined(__alpha__)
-#include "blkid_types-alpha.h"
-#elif defined(__arm__)
-#include "blkid_types-arm.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "blkid_types-sparc64.h"
-#elif defined(__sparc__)
-#include "blkid_types-sparc.h"
-#else
-#error "This e2fsprogs-devel package does not work your architecture?"
-#endif
-
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 9aae993..a6e35bf 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -7,7 +7,6 @@ Release: 0%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: https://www.kernel.org/pub/linux/kernel/people/tytso/%{name}/v%{version}/%{name}-%{version}.tar.xz
-Source1: ext2_types-wrapper.h
 
 Url: http://e2fsprogs.sourceforge.net/
 Requires: e2fsprogs-libs%{?_isa} = %{version}-%{release}
@@ -26,6 +25,7 @@ BuildRequires: libsepol-devel
 BuildRequires: libblkid-devel
 BuildRequires: libuuid-devel
 BuildRequires: gettext
+BuildRequires: multilib-rpm-config
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
@@ -157,14 +157,8 @@ export PATH=/sbin:$PATH
 make install install-libs DESTDIR=%{buildroot} INSTALL="%{__install} -p" \
 	root_sbindir=%{_sbindir} root_libdir=%{_libdir}
 
-# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
-%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
-
-%ifarch %{multilib_arches}
-mv -f %{buildroot}%{_includedir}/ext2fs/ext2_types.h \
-      %{buildroot}%{_includedir}/ext2fs/ext2_types-%{_arch}.h
-install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/ext2fs/ext2_types.h
-%endif
+# Replace arch-dependent header file with arch-independent stub (when needed).
+%multilib_fix_c_header --file %{_includedir}/ext2fs/ext2_types.h
 
 # Hack for now, otherwise strip fails.
 chmod +w %{buildroot}%{_libdir}/*.a
diff --git a/ext2_types-wrapper.h b/ext2_types-wrapper.h
deleted file mode 100644
index 69f4d6f..0000000
--- a/ext2_types-wrapper.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This file is here to prevent a file conflict on multiarch systems. A
- * conflict will occur because ext2_types.h has arch-specific definitions.
- *
- * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
-
-#if defined(__i386__)
-#include "ext2_types-i386.h"
-#elif defined(__powerpc64__)
-#include "ext2_types-ppc64.h"
-#elif defined(__powerpc__)
-#include "ext2_types-ppc.h"
-#elif defined(__s390x__)
-#include "ext2_types-s390x.h"
-#elif defined(__s390__)
-#include "ext2_types-s390.h"
-#elif defined(__x86_64__)
-#include "ext2_types-x86_64.h"
-#elif defined(__alpha__)
-#include "ext2_types-alpha.h"
-#elif defined(__arm__)
-#include "ext2_types-arm.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "ext2_types-sparc64.h"
-#elif defined(__sparc__)
-#include "ext2_types-sparc.h"
-#else
-#error "This e2fsprogs-devel package does not work your architecture?"
-#endif
-