diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h b/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h
index 486ba6eb0001..15a7bd203b27 100644
--- a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h
+++ b/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h
@@ -1,22 +1,6 @@
---- source/mupen64plus-video-glide64mk2/src/Glide64/Util.h.orig	2013-07-03 20:28:17.000000000 -0400
-+++ source/mupen64plus-video-glide64mk2/src/Glide64/Util.h	2014-09-01 12:32:50.282026994 -0400
-@@ -40,6 +40,8 @@
- #ifndef Util_H
- #define Util_H
- 
-+#include <sys/endian.h>
-+
- #define NOT_TMU0	0x00
- #define NOT_TMU1	0x01
- #define NOT_TMU2	0x02
-@@ -90,12 +92,11 @@
- 			lx = lc; \
- 		}
- 
--#if defined(__GNUC__)
--  #define bswap32(x) __builtin_bswap32(x)
--#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
-+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+--- source/mupen64plus-video-glide64mk2/src/Glide64/Util.h	2015-06-12 20:48:15.000000000 -0500
++++ source/mupen64plus-video-glide64mk2/src/Glide64/Util.h	2015-06-12 20:48:41.000000000 -0500
+@@ -94,6 +94,7 @@
    #include <stdlib.h>
    #define bswap32(x) _byteswap_ulong(x)
  #else
@@ -24,7 +8,7 @@
  static inline uint32_t bswap32(uint32_t val)
  {
  	return (((val & 0xff000000) >> 24) |
-@@ -104,6 +105,7 @@
+@@ -102,6 +103,7 @@
  		((val & 0x000000ff) << 24));
  }
  #endif
diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-GlideHQ_TxDbg.cpp b/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-GlideHQ_TxDbg.cpp
deleted file mode 100644
index 37344ef05b77..000000000000
--- a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-GlideHQ_TxDbg.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- source/mupen64plus-video-glide64mk2/src/GlideHQ/TxDbg.cpp	2013-10-04 03:11:58.000000000 -0500
-+++ source/mupen64plus-video-glide64mk2/src/GlideHQ/TxDbg.cpp	2013-10-04 03:16:46.000000000 -0500
-@@ -53,7 +53,7 @@
- void
- TxDbg::output(const int level, const wchar_t *format, ...)
- {
--#ifdef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-+#if defined _GLIBCXX_HAVE_BROKEN_VSWPRINTF || defined (__FreeBSD__)
-   wchar_t newformat[4095];
- #else
-   std::wstring newformat;
-@@ -65,8 +65,12 @@
-     return;
- 
-   va_start(args, format);
--#ifdef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
-+#if defined _GLIBCXX_HAVE_BROKEN_VSWPRINTF || defined (__FreeBSD__)
-+#if defined(__FreeBSD__)
-+  swprintf(newformat, sizeof(newformat)/sizeof(*newformat), L"%d:\t", level);
-+#else
-   swprintf(newformat, L"%d:\t", level);
-+#endif
-   wcscat(newformat, format);
-   vfwprintf(_dbgfile, newformat, args);
- #else