diff --git a/src/gdal.mk b/src/gdal.mk
index fdf39ebb..9e72054b 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -108,6 +108,5 @@ define $(PKG)_BUILD_i686-w64-mingw32
     $($(PKG)_MAKE)
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32.shared =
 $(PKG)_BUILD_i686-w64-mingw32.shared =
 $(PKG)_BUILD_x86_64-w64-mingw32.shared =
diff --git a/src/libvpx.mk b/src/libvpx.mk
index 7eac5716..bc2f7743 100644
--- a/src/libvpx.mk
+++ b/src/libvpx.mk
@@ -31,6 +31,5 @@ define $(PKG)_BUILD
     $(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32    = $(subst @libvpx-target@,x86-win32-gcc,$($(PKG)_BUILD))
 $(PKG)_BUILD_i686-w64-mingw32   = $(subst @libvpx-target@,x86-win32-gcc,$($(PKG)_BUILD))
 $(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @libvpx-target@,x86_64-win64-gcc,$($(PKG)_BUILD))
diff --git a/src/libwebsockets.mk b/src/libwebsockets.mk
index 36a24500..f1367d55 100644
--- a/src/libwebsockets.mk
+++ b/src/libwebsockets.mk
@@ -23,6 +23,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j $(JOBS)
     $(MAKE) -C '$(1)' install
 endef
-
-# MinGW 32 lacks mstcpip.h
-$(PKG)_BUILD_i686-pc-mingw32 =
\ No newline at end of file
diff --git a/src/oce.mk b/src/oce.mk
index d03e566b..ce499fa4 100644
--- a/src/oce.mk
+++ b/src/oce.mk
@@ -32,4 +32,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)/examples/find_package_oce'
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/openssl.mk b/src/openssl.mk
index de64d47f..c2d63c80 100644
--- a/src/openssl.mk
+++ b/src/openssl.mk
@@ -32,6 +32,5 @@ define $(PKG)_BUILD
         CROSS_COMPILE='$(TARGET)-'
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32    = $(subst @openssl-target@,mingw,$($(PKG)_BUILD))
 $(PKG)_BUILD_i686-w64-mingw32   = $(subst @openssl-target@,mingw,$($(PKG)_BUILD))
 $(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @openssl-target@,mingw64,$($(PKG)_BUILD))
diff --git a/src/portaudio.mk b/src/portaudio.mk
index e0f4f488..b0f0c325 100644
--- a/src/portaudio.mk
+++ b/src/portaudio.mk
@@ -25,7 +25,7 @@ define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         --with-host_os=mingw \
-        --with-winapi=@portaudio-winapi@ \
+        --with-winapi=wmme,directx \
         --with-dxdir=$(PREFIX)/$(TARGET) \
         ac_cv_path_AR=$(TARGET)-ar \
         $(if $(BUILD_SHARED),\
@@ -39,10 +39,3 @@ define $(PKG)_BUILD
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-portaudio.exe' \
         `'$(TARGET)-pkg-config' portaudio-2.0 --cflags --libs`
 endef
-
-$(PKG)_WINAPI_MINGW_ORG = wmme,directx,wasapi,wdmks
-$(PKG)_WINAPI_MINGW_W64 = wmme,directx
-
-$(PKG)_BUILD_i686-pc-mingw32    = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_ORG),$($(PKG)_BUILD))
-$(PKG)_BUILD_i686-w64-mingw32   = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD))
-$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD))
diff --git a/src/qscintilla2.mk b/src/qscintilla2.mk
index 8e12d0ae..37872b5e 100644
--- a/src/qscintilla2.mk
+++ b/src/qscintilla2.mk
@@ -30,4 +30,3 @@ define $(PKG)_BUILD
 	`'$(TARGET)-pkg-config' Qt5Widgets --libs`
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qt3d.mk b/src/qt3d.mk
index a41eac7a..ab6c7675 100644
--- a/src/qt3d.mk
+++ b/src/qt3d.mk
@@ -17,4 +17,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index 35e610a2..2d0f9c44 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtbase.mk b/src/qtbase.mk
index 4d57d813..e51734cb 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -84,7 +84,6 @@ define $(PKG)_BUILD
      > '$(PREFIX)/$(TARGET)/bin/test-qt5.bat'
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
 
 $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\
                       $(subst -qt-sql-,-plugin-sql-,\
diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk
index d0702297..b1c0f37f 100644
--- a/src/qtconnectivity.mk
+++ b/src/qtconnectivity.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk
index 84bd7fdf..567f308d 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtenginio.mk b/src/qtenginio.mk
index 8952e588..5bbe235f 100644
--- a/src/qtenginio.mk
+++ b/src/qtenginio.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index 1c802f03..e2932331 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk
index 949cf0f0..e9e94982 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtlocation.mk b/src/qtlocation.mk
index 22ae68cb..1bbe3d21 100644
--- a/src/qtlocation.mk
+++ b/src/qtlocation.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index b8e67a3a..bc07de63 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtquick1.mk b/src/qtquick1.mk
index 6df9fe62..c3471849 100644
--- a/src/qtquick1.mk
+++ b/src/qtquick1.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk
index c61c122b..78b85e40 100644
--- a/src/qtquickcontrols.mk
+++ b/src/qtquickcontrols.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtscript.mk b/src/qtscript.mk
index b236c33e..a1db8696 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsensors.mk b/src/qtsensors.mk
index 6c4c6ac4..e88abbf8 100644
--- a/src/qtsensors.mk
+++ b/src/qtsensors.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtserialport.mk b/src/qtserialport.mk
index 61d2d02f..cf743e45 100644
--- a/src/qtserialport.mk
+++ b/src/qtserialport.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtservice.mk b/src/qtservice.mk
index 9413fedb..a7486d6d 100644
--- a/src/qtservice.mk
+++ b/src/qtservice.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)/qtservice/buildlib' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsvg.mk b/src/qtsvg.mk
index 75f9fd97..d82c7c46 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsystems.mk b/src/qtsystems.mk
index 163ac16c..8ace17ce 100644
--- a/src/qtsystems.mk
+++ b/src/qtsystems.mk
@@ -21,4 +21,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qttools.mk b/src/qttools.mk
index 97e848e9..00dcd974 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qttranslations.mk b/src/qttranslations.mk
index ac037224..b8f7a077 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk
index 2c92bed1..c12b0f29 100644
--- a/src/qtwebkit.mk
+++ b/src/qtwebkit.mk
@@ -22,4 +22,3 @@ define $(PKG)_BUILD_SHARED
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk
index a2723ddb..1b884713 100644
--- a/src/qtwebsockets.mk
+++ b/src/qtwebsockets.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk
index 0137cb48..d9612e9f 100644
--- a/src/qtwinextras.mk
+++ b/src/qtwinextras.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk
index 37e70860..ba37b1de 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -20,4 +20,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qwt.mk b/src/qwt.mk
index 32f7271e..daba291b 100644
--- a/src/qwt.mk
+++ b/src/qwt.mk
@@ -32,4 +32,3 @@ define $(PKG)_BUILD
     $(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(PREFIX)/$(TARGET)/bin/test-qwt.exe'
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/sdl2.mk b/src/sdl2.mk
index b7f8dbe4..ca4e2dc3 100644
--- a/src/sdl2.mk
+++ b/src/sdl2.mk
@@ -28,6 +28,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
     ln -sf '$(PREFIX)/$(TARGET)/bin/sdl2-config' '$(PREFIX)/bin/$(TARGET)-sdl2-config'
 endef
-
-# MinGW32 does not have dxgi.h...
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/sdl2_gfx.mk b/src/sdl2_gfx.mk
index 876063bb..b11a3175 100644
--- a/src/sdl2_gfx.mk
+++ b/src/sdl2_gfx.mk
@@ -30,6 +30,3 @@ define $(PKG)_BUILD
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2_gfx.exe' \
         `'$(TARGET)-pkg-config' SDL2_gfx --cflags --libs`
 endef
-
-# sdl2 is disabled on i686-pc-mingw32.
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/sdl2_image.mk b/src/sdl2_image.mk
index 35058534..c65dec63 100644
--- a/src/sdl2_image.mk
+++ b/src/sdl2_image.mk
@@ -28,6 +28,3 @@ define $(PKG)_BUILD
         --disable-tif-shared
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
-
-# Disable until sdl2 can be built on MinGW32
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/sdl2_mixer.mk b/src/sdl2_mixer.mk
index 0f0dc8d1..0d043217 100644
--- a/src/sdl2_mixer.mk
+++ b/src/sdl2_mixer.mk
@@ -47,5 +47,4 @@ define $(PKG)_BUILD
         `'$(TARGET)-pkg-config' SDL2_mixer --cflags --libs`
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
 
diff --git a/src/sdl2_net.mk b/src/sdl2_net.mk
index dce95182..cae16446 100644
--- a/src/sdl2_net.mk
+++ b/src/sdl2_net.mk
@@ -31,4 +31,3 @@ define $(PKG)_BUILD
         -lws2_32 -liphlpapi
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/sdl2_ttf.mk b/src/sdl2_ttf.mk
index f646ef84..3f2f4ad2 100644
--- a/src/sdl2_ttf.mk
+++ b/src/sdl2_ttf.mk
@@ -28,4 +28,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/smpeg2.mk b/src/smpeg2.mk
index b2351200..c600cb8f 100644
--- a/src/smpeg2.mk
+++ b/src/smpeg2.mk
@@ -36,4 +36,3 @@ define $(PKG)_BUILD
         `'$(PREFIX)/$(TARGET)/bin/smpeg2-config' --cflags --libs`
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32 =