diff --git a/configure b/configure
index 8bd9e35bf08..ddfce47346a 100755
--- a/configure
+++ b/configure
@@ -13719,6 +13719,7 @@ fi
 if test "x$ac_cv_have_openalsoft" != xyes
 then
     as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported"
+    enable_xaudio2_2=${enable_xaudio2_2:-no}
     enable_xaudio2_3=${enable_xaudio2_3:-no}
     enable_xaudio2_4=${enable_xaudio2_4:-no}
     enable_xaudio2_5=${enable_xaudio2_5:-no}
diff --git a/configure.ac b/configure.ac
index 9ee7b747b07..60e2f2864cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1662,6 +1662,7 @@ fi
 if test "x$ac_cv_have_openalsoft" != xyes
 then
     WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported])
+    enable_xaudio2_2=${enable_xaudio2_2:-no}
     enable_xaudio2_3=${enable_xaudio2_3:-no}
     enable_xaudio2_4=${enable_xaudio2_4:-no}
     enable_xaudio2_5=${enable_xaudio2_5:-no}
diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in
index 94701995a4c..77f21bdd077 100644
--- a/dlls/xaudio2_2/Makefile.in
+++ b/dlls/xaudio2_2/Makefile.in
@@ -1,7 +1,12 @@
+EXTRADEFS = -DXAUDIO2_VER=2
 MODULE    = xaudio2_2.dll
-IMPORTS   = ole32
+IMPORTS   = advapi32 kernel32 ole32 user32 uuid
+EXTRALIBS = $(OPENAL_LIBS)
+PARENTSRC = ../xaudio2_7
 
 C_SRCS = \
+	compat.c \
+	xapofx.c \
 	xaudio_dll.c
 
 IDL_SRCS = xaudio_classes.idl
diff --git a/dlls/xaudio2_2/xaudio2_2.spec b/dlls/xaudio2_2/xaudio2_2.spec
index cb263d4836b..b16365d0c9f 100644
--- a/dlls/xaudio2_2/xaudio2_2.spec
+++ b/dlls/xaudio2_2/xaudio2_2.spec
@@ -1,4 +1,4 @@
 @ stdcall -private DllCanUnloadNow()
-@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()
diff --git a/dlls/xaudio2_2/xaudio_classes.idl b/dlls/xaudio2_2/xaudio_classes.idl
deleted file mode 100644
index 1d49ffbf29f..00000000000
--- a/dlls/xaudio2_2/xaudio_classes.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * COM Classes for xaudio
- *
- * Copyright 2015 Andrew Eikum for CodeWeavers
- *
- * 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
- */
-
-#pragma makedep register
-
-[
-    helpstring("XAudio2.2 Class"),
-    threading(both),
-    uuid(b802058a-464a-42db-bc10-b650d6f2586a)
-]
-coclass XAudio22 { interface IXAudio22; }
-
-[
-    helpstring("XAudio2.2 AudioReverb Class"),
-    threading(both),
-    uuid(629cf0de-3ecc-41e7-9926-f7e43eebec51)
-]
-coclass AudioReverb22 { interface IXAPO; }
-
-[
-    helpstring("XAudio2.2 AudioVolumeMeter Class"),
-    threading(both),
-    uuid(f5ca7b34-8055-42c0-b836-216129eb7e30)
-]
-coclass AudioVolumeMeter22 { interface IXAPO; }
diff --git a/dlls/xaudio2_2/xaudio_dll.c b/dlls/xaudio2_2/xaudio_dll.c
deleted file mode 100644
index e55861c100a..00000000000
--- a/dlls/xaudio2_2/xaudio_dll.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2015 Andrew Eikum for CodeWeavers
- *
- * 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
- */
-
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "rpcproxy.h"
-
-static HINSTANCE instance;
-
-BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved)
-{
-    switch (reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;    /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        instance = hinstance;
-        DisableThreadLibraryCalls(hinstance);
-        break;
-    }
-    return TRUE;
-}
-
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
-HRESULT WINAPI DllRegisterServer(void)
-{
-    return __wine_register_resources(instance);
-}
-
-HRESULT WINAPI DllUnregisterServer(void)
-{
-    return __wine_unregister_resources(instance);
-}
diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl
index 5ec42fdb2a4..27b74c96779 100644
--- a/dlls/xaudio2_7/xaudio_classes.idl
+++ b/dlls/xaudio2_7/xaudio_classes.idl
@@ -211,3 +211,26 @@ coclass AudioReverb23 { interface IXAPO; }
 ]
 coclass AudioVolumeMeter23 { interface IXAPO; }
 #endif /* XAUDIO2_VER == 3 */
+
+#if XAUDIO2_VER == 2
+[
+    helpstring("XAudio2.2 Class"),
+    threading(both),
+    uuid(b802058a-464a-42db-bc10-b650d6f2586a)
+]
+coclass XAudio22 { interface IXAudio22; }
+
+[
+    helpstring("XAudio2.2 AudioReverb Class"),
+    threading(both),
+    uuid(629cf0de-3ecc-41e7-9926-f7e43eebec51)
+]
+coclass AudioReverb22 { interface IXAPO; }
+
+[
+    helpstring("XAudio2.2 AudioVolumeMeter Class"),
+    threading(both),
+    uuid(f5ca7b34-8055-42c0-b836-216129eb7e30)
+]
+coclass AudioVolumeMeter22 { interface IXAPO; }
+#endif /* XAUDIO2_VER == 2 */