diff --git a/configure b/configure
index 66437786a5e..644dd4c5066 100755
--- a/configure
+++ b/configure
@@ -18444,6 +18444,7 @@ wine_fn_config_dll mf3216 enable_mf3216
 wine_fn_config_dll mfplat enable_mfplat implib
 wine_fn_config_test dlls/mfplat/tests mfplat_test
 wine_fn_config_dll mfreadwrite enable_mfreadwrite
+wine_fn_config_lib mfuuid
 wine_fn_config_dll mgmtapi enable_mgmtapi
 wine_fn_config_dll midimap enable_midimap
 wine_fn_config_dll mlang enable_mlang clean,implib
diff --git a/configure.ac b/configure.ac
index f5a617c1c33..54ae4253a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3233,6 +3233,7 @@ WINE_CONFIG_DLL(mf3216)
 WINE_CONFIG_DLL(mfplat,,[implib])
 WINE_CONFIG_TEST(dlls/mfplat/tests)
 WINE_CONFIG_DLL(mfreadwrite)
+WINE_CONFIG_LIB(mfuuid)
 WINE_CONFIG_DLL(mgmtapi)
 WINE_CONFIG_DLL(midimap)
 WINE_CONFIG_DLL(mlang,,[clean,implib])
diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in
new file mode 100644
index 00000000000..5fbb522782c
--- /dev/null
+++ b/dlls/mfuuid/Makefile.in
@@ -0,0 +1,4 @@
+MODULE    = libmfuuid.a
+
+C_SRCS = \
+	mfuuid.c
diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c
new file mode 100644
index 00000000000..f9b1a8a4b4e
--- /dev/null
+++ b/dlls/mfuuid/mfuuid.c
@@ -0,0 +1,30 @@
+/*
+ * GUID definitions
+ *
+ * Copyright 2017 Fabian Maurer
+ *
+ * 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 "propsys.h"
+#include "strmif.h"
+#include "mediaobj.h"
+
+#include "initguid.h"
+
+#include "mfapi.h"
+#include "mfidl.h"
+#include "mfreadwrite.h"