diff --git a/configure b/configure
index d53583dfbcb..eda1f7b9411 100755
--- a/configure
+++ b/configure
@@ -1594,6 +1594,7 @@ enable_winusb
 enable_wlanapi
 enable_wldap32
 enable_wmasf
+enable_wmcodecdspuuid
 enable_wmi
 enable_wmiutils
 enable_wmp
@@ -8839,6 +8840,8 @@ CROSSTARGET=""
 if test "x$enable_tests" != xno -a "$LIBEXT" != "dll"
 then
     case "$host_cpu" in
+  aarch64*)
+    ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;;
   arm*)
     ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;;
   i[3456789]86*)
@@ -19171,6 +19174,7 @@ wine_fn_config_makefile dlls/wlanapi/tests enable_tests
 wine_fn_config_makefile dlls/wldap32 enable_wldap32
 wine_fn_config_makefile dlls/wldap32/tests enable_tests
 wine_fn_config_makefile dlls/wmasf enable_wmasf
+wine_fn_config_makefile dlls/wmcodecdspuuid enable_wmcodecdspuuid
 wine_fn_config_makefile dlls/wmi enable_wmi
 wine_fn_config_makefile dlls/wmiutils enable_wmiutils
 wine_fn_config_makefile dlls/wmiutils/tests enable_tests
diff --git a/configure.ac b/configure.ac
index b4a8ef0d13b..bea3aa24765 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3773,6 +3773,7 @@ WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests)
 WINE_CONFIG_MAKEFILE(dlls/wldap32)
 WINE_CONFIG_MAKEFILE(dlls/wldap32/tests)
 WINE_CONFIG_MAKEFILE(dlls/wmasf)
+WINE_CONFIG_MAKEFILE(dlls/wmcodecdspuuid)
 WINE_CONFIG_MAKEFILE(dlls/wmi)
 WINE_CONFIG_MAKEFILE(dlls/wmiutils)
 WINE_CONFIG_MAKEFILE(dlls/wmiutils/tests)
diff --git a/dlls/wmcodecdspuuid/Makefile.in b/dlls/wmcodecdspuuid/Makefile.in
new file mode 100644
index 00000000000..d8f5d024413
--- /dev/null
+++ b/dlls/wmcodecdspuuid/Makefile.in
@@ -0,0 +1,4 @@
+MODULE    = libwmcodecdspuuid.a
+
+C_SRCS = \
+	wmcodecdspuuid.c
diff --git a/dlls/wmcodecdspuuid/wmcodecdspuuid.c b/dlls/wmcodecdspuuid/wmcodecdspuuid.c
new file mode 100644
index 00000000000..c715641dda2
--- /dev/null
+++ b/dlls/wmcodecdspuuid/wmcodecdspuuid.c
@@ -0,0 +1,27 @@
+/*
+ * GUID definitions
+ *
+ * Copyright 2018 Zebediah Figura
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* Don't define those GUIDs here */
+#include "strmif.h"
+#include "mediaobj.h"
+
+#include "initguid.h"
+
+#include "wmcodecdsp.h"