Index: trunk/src/VBox/Devices/Audio/AudioMixer.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/AudioMixer.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/AudioMixer.cpp	(revision 88230)
@@ -74,5 +74,5 @@
 #include "AudioMixer.h"
 #include "AudioMixBuffer.h"
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 
 #include <VBox/vmm/pdm.h>
Index: trunk/src/VBox/Devices/Audio/DevHda.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevHda.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DevHda.cpp	(revision 88230)
@@ -59,5 +59,5 @@
 #include "DevHdaStreamMap.h"
 
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 
 
Index: trunk/src/VBox/Devices/Audio/DevHdaCodec.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevHdaCodec.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DevHdaCodec.cpp	(revision 88230)
@@ -39,5 +39,4 @@
 
 #include "VBoxDD.h"
-#include "DrvAudio.h"
 #include "AudioMixer.h"
 #include "DevHdaCodec.h"
Index: trunk/src/VBox/Devices/Audio/DevHdaCommon.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevHdaCommon.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DevHdaCommon.cpp	(revision 88230)
@@ -24,4 +24,5 @@
 #include <iprt/assert.h>
 #include <iprt/errcore.h>
+#include <iprt/time.h>
 
 #include <VBox/AssertGuest.h>
@@ -29,6 +30,4 @@
 #define LOG_GROUP LOG_GROUP_DEV_HDA
 #include <VBox/log.h>
-
-#include "DrvAudio.h"
 
 #include "DevHda.h"
Index: trunk/src/VBox/Devices/Audio/DevHdaStream.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevHdaStream.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DevHdaStream.cpp	(revision 88230)
@@ -31,5 +31,5 @@
 #include <VBox/vmm/pdmaudioinline.h>
 
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 
 #include "DevHda.h"
Index: trunk/src/VBox/Devices/Audio/DevHdaStreamMap.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevHdaStreamMap.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DevHdaStreamMap.cpp	(revision 88230)
@@ -30,5 +30,5 @@
 #include <iprt/string.h>
 
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 
 #include "DevHdaStreamChannel.h"
Index: trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 88230)
@@ -41,5 +41,5 @@
 #include "AudioMixBuffer.h"
 #include "AudioMixer.h"
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 
 
Index: trunk/src/VBox/Devices/Audio/DevSB16.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DevSB16.cpp	(revision 88230)
@@ -63,5 +63,5 @@
 #include "AudioMixBuffer.h"
 #include "AudioMixer.h"
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 
 
Index: trunk/src/VBox/Devices/Audio/DrvAudio.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvAudio.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvAudio.cpp	(revision 88230)
@@ -44,6 +44,160 @@
 #include <stdlib.h>
 
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 #include "AudioMixBuffer.h"
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+typedef enum
+{
+    AUD_OPT_INT,
+    AUD_OPT_FMT,
+    AUD_OPT_STR,
+    AUD_OPT_BOOL
+} audio_option_tag_e;
+
+typedef struct audio_option
+{
+    const char *name;
+    audio_option_tag_e tag;
+    void *valp;
+    const char *descr;
+    int *overridenp;
+    int overriden;
+} audio_option;
+
+#ifdef VBOX_WITH_STATISTICS
+/**
+ * Structure for keeping stream statistics for the
+ * statistic manager (STAM).
+ */
+typedef struct DRVAUDIOSTATS
+{
+    STAMCOUNTER TotalStreamsActive;
+    STAMCOUNTER TotalStreamsCreated;
+    STAMCOUNTER TotalFramesRead;
+    STAMCOUNTER TotalFramesWritten;
+    STAMCOUNTER TotalFramesMixedIn;
+    STAMCOUNTER TotalFramesMixedOut;
+    STAMCOUNTER TotalFramesLostIn;
+    STAMCOUNTER TotalFramesLostOut;
+    STAMCOUNTER TotalFramesOut;
+    STAMCOUNTER TotalFramesIn;
+    STAMCOUNTER TotalBytesRead;
+    STAMCOUNTER TotalBytesWritten;
+    /** How much delay (in ms) for input processing. */
+    STAMPROFILEADV DelayIn;
+    /** How much delay (in ms) for output processing. */
+    STAMPROFILEADV DelayOut;
+} DRVAUDIOSTATS, *PDRVAUDIOSTATS;
+#endif
+
+/**
+ * Audio driver configuration data, tweakable via CFGM.
+ */
+typedef struct DRVAUDIOCFG
+{
+    /** PCM properties to use. */
+    PDMAUDIOPCMPROPS     Props;
+    /** Whether using signed sample data or not.
+     *  Needed in order to know whether there is a custom value set in CFGM or not.
+     *  By default set to UINT8_MAX if not set to a custom value. */
+    uint8_t              uSigned;
+    /** Whether swapping endianess of sample data or not.
+     *  Needed in order to know whether there is a custom value set in CFGM or not.
+     *  By default set to UINT8_MAX if not set to a custom value. */
+    uint8_t              uSwapEndian;
+    /** Configures the period size (in ms).
+     *  This value reflects the time in between each hardware interrupt on the
+     *  backend (host) side. */
+    uint32_t             uPeriodSizeMs;
+    /** Configures the (ring) buffer size (in ms). Often is a multiple of uPeriodMs. */
+    uint32_t             uBufferSizeMs;
+    /** Configures the pre-buffering size (in ms).
+     *  Time needed in buffer before the stream becomes active (pre buffering).
+     *  The bigger this value is, the more latency for the stream will occur.
+     *  Set to 0 to disable pre-buffering completely.
+     *  By default set to UINT32_MAX if not set to a custom value. */
+    uint32_t             uPreBufSizeMs;
+    /** The driver's debugging configuration. */
+    struct
+    {
+        /** Whether audio debugging is enabled or not. */
+        bool             fEnabled;
+        /** Where to store the debugging files. */
+        char             szPathOut[RTPATH_MAX];
+    } Dbg;
+} DRVAUDIOCFG, *PDRVAUDIOCFG;
+
+/**
+ * Audio driver instance data.
+ *
+ * @implements PDMIAUDIOCONNECTOR
+ */
+typedef struct DRVAUDIO
+{
+    /** Friendly name of the driver. */
+    char                    szName[64];
+    /** Critical section for serializing access. */
+    RTCRITSECT              CritSect;
+    /** Shutdown indicator. */
+    bool                    fTerminate;
+    /** Our audio connector interface. */
+    PDMIAUDIOCONNECTOR      IAudioConnector;
+    /** Pointer to the driver instance. */
+    PPDMDRVINS              pDrvIns;
+    /** Pointer to audio driver below us. */
+    PPDMIHOSTAUDIO          pHostDrvAudio;
+    /** List of audio streams. */
+    RTLISTANCHOR            lstStreams;
+#ifdef VBOX_WITH_AUDIO_ENUM
+    /** Flag indicating to perform an (re-)enumeration of the host audio devices. */
+    bool                    fEnumerateDevices;
+#endif
+    /** Audio configuration settings retrieved from the backend. */
+    PDMAUDIOBACKENDCFG      BackendCfg;
+    /** Commonly used scratch buffer. */
+    void                   *pvScratchBuf;
+    /** Size (in bytes) of commonly used scratch buffer. */
+    size_t                  cbScratchBuf;
+#ifdef VBOX_WITH_STATISTICS
+    /** Statistics for the statistics manager (STAM). */
+    DRVAUDIOSTATS           Stats;
+#endif
+    struct
+    {
+        /** Whether this driver's input streams are enabled or not.
+         *  This flag overrides all the attached stream statuses. */
+        bool                fEnabled;
+        /** Max. number of free input streams.
+         *  UINT32_MAX for unlimited streams. */
+        uint32_t            cStreamsFree;
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+        RTLISTANCHOR        lstCB;
+#endif
+        /** The driver's input confguration (tweakable via CFGM). */
+        DRVAUDIOCFG         Cfg;
+    } In;
+    struct
+    {
+        /** Whether this driver's output streams are enabled or not.
+         *  This flag overrides all the attached stream statuses. */
+        bool                fEnabled;
+        /** Max. number of free output streams.
+         *  UINT32_MAX for unlimited streams. */
+        uint32_t            cStreamsFree;
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+        RTLISTANCHOR        lstCB;
+#endif
+        /** The driver's output confguration (tweakable via CFGM). */
+        DRVAUDIOCFG         Cfg;
+    } Out;
+} DRVAUDIO, *PDRVAUDIO;
+
+/** Makes a PDRVAUDIO out of a PPDMIAUDIOCONNECTOR. */
+#define PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface) \
+    ( (PDRVAUDIO)((uintptr_t)pInterface - RT_UOFFSETOF(DRVAUDIO, IAudioConnector)) )
 
 
Index: trunk/src/VBox/Devices/Audio/DrvAudio.h
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvAudio.h	(revision 88229)
+++ 	(revision )
@@ -1,227 +1,0 @@
-/* $Id$ */
-/** @file
- * Intermediate audio driver header.
- */
-
-/*
- * Copyright (C) 2006-2020 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef VBOX_INCLUDED_SRC_Audio_DrvAudio_h
-#define VBOX_INCLUDED_SRC_Audio_DrvAudio_h
-#ifndef RT_WITHOUT_PRAGMA_ONCE
-# pragma once
-#endif
-
-#include <limits.h>
-
-#include <iprt/circbuf.h>
-#include <iprt/critsect.h>
-#include <iprt/file.h>
-#include <iprt/path.h>
-
-#include <VBox/vmm/pdmdev.h>
-#include <VBox/vmm/pdm.h>
-#include <VBox/vmm/pdmaudioifs.h>
-
-typedef enum
-{
-    AUD_OPT_INT,
-    AUD_OPT_FMT,
-    AUD_OPT_STR,
-    AUD_OPT_BOOL
-} audio_option_tag_e;
-
-typedef struct audio_option
-{
-    const char *name;
-    audio_option_tag_e tag;
-    void *valp;
-    const char *descr;
-    int *overridenp;
-    int overriden;
-} audio_option;
-
-#ifdef VBOX_WITH_STATISTICS
-/**
- * Structure for keeping stream statistics for the
- * statistic manager (STAM).
- */
-typedef struct DRVAUDIOSTATS
-{
-    STAMCOUNTER TotalStreamsActive;
-    STAMCOUNTER TotalStreamsCreated;
-    STAMCOUNTER TotalFramesRead;
-    STAMCOUNTER TotalFramesWritten;
-    STAMCOUNTER TotalFramesMixedIn;
-    STAMCOUNTER TotalFramesMixedOut;
-    STAMCOUNTER TotalFramesLostIn;
-    STAMCOUNTER TotalFramesLostOut;
-    STAMCOUNTER TotalFramesOut;
-    STAMCOUNTER TotalFramesIn;
-    STAMCOUNTER TotalBytesRead;
-    STAMCOUNTER TotalBytesWritten;
-    /** How much delay (in ms) for input processing. */
-    STAMPROFILEADV DelayIn;
-    /** How much delay (in ms) for output processing. */
-    STAMPROFILEADV DelayOut;
-} DRVAUDIOSTATS, *PDRVAUDIOSTATS;
-#endif
-
-/**
- * Audio driver configuration data, tweakable via CFGM.
- */
-typedef struct DRVAUDIOCFG
-{
-    /** PCM properties to use. */
-    PDMAUDIOPCMPROPS     Props;
-    /** Whether using signed sample data or not.
-     *  Needed in order to know whether there is a custom value set in CFGM or not.
-     *  By default set to UINT8_MAX if not set to a custom value. */
-    uint8_t              uSigned;
-    /** Whether swapping endianess of sample data or not.
-     *  Needed in order to know whether there is a custom value set in CFGM or not.
-     *  By default set to UINT8_MAX if not set to a custom value. */
-    uint8_t              uSwapEndian;
-    /** Configures the period size (in ms).
-     *  This value reflects the time in between each hardware interrupt on the
-     *  backend (host) side. */
-    uint32_t             uPeriodSizeMs;
-    /** Configures the (ring) buffer size (in ms). Often is a multiple of uPeriodMs. */
-    uint32_t             uBufferSizeMs;
-    /** Configures the pre-buffering size (in ms).
-     *  Time needed in buffer before the stream becomes active (pre buffering).
-     *  The bigger this value is, the more latency for the stream will occur.
-     *  Set to 0 to disable pre-buffering completely.
-     *  By default set to UINT32_MAX if not set to a custom value. */
-    uint32_t             uPreBufSizeMs;
-    /** The driver's debugging configuration. */
-    struct
-    {
-        /** Whether audio debugging is enabled or not. */
-        bool             fEnabled;
-        /** Where to store the debugging files. */
-        char             szPathOut[RTPATH_MAX];
-    } Dbg;
-} DRVAUDIOCFG, *PDRVAUDIOCFG;
-
-/**
- * Audio driver instance data.
- *
- * @implements PDMIAUDIOCONNECTOR
- */
-typedef struct DRVAUDIO
-{
-    /** Friendly name of the driver. */
-    char                    szName[64];
-    /** Critical section for serializing access. */
-    RTCRITSECT              CritSect;
-    /** Shutdown indicator. */
-    bool                    fTerminate;
-    /** Our audio connector interface. */
-    PDMIAUDIOCONNECTOR      IAudioConnector;
-    /** Pointer to the driver instance. */
-    PPDMDRVINS              pDrvIns;
-    /** Pointer to audio driver below us. */
-    PPDMIHOSTAUDIO          pHostDrvAudio;
-    /** List of audio streams. */
-    RTLISTANCHOR            lstStreams;
-#ifdef VBOX_WITH_AUDIO_ENUM
-    /** Flag indicating to perform an (re-)enumeration of the host audio devices. */
-    bool                    fEnumerateDevices;
-#endif
-    /** Audio configuration settings retrieved from the backend. */
-    PDMAUDIOBACKENDCFG      BackendCfg;
-    /** Commonly used scratch buffer. */
-    void                   *pvScratchBuf;
-    /** Size (in bytes) of commonly used scratch buffer. */
-    size_t                  cbScratchBuf;
-#ifdef VBOX_WITH_STATISTICS
-    /** Statistics for the statistics manager (STAM). */
-    DRVAUDIOSTATS           Stats;
-#endif
-    struct
-    {
-        /** Whether this driver's input streams are enabled or not.
-         *  This flag overrides all the attached stream statuses. */
-        bool                fEnabled;
-        /** Max. number of free input streams.
-         *  UINT32_MAX for unlimited streams. */
-        uint32_t            cStreamsFree;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-        RTLISTANCHOR        lstCB;
-#endif
-        /** The driver's input confguration (tweakable via CFGM). */
-        DRVAUDIOCFG         Cfg;
-    } In;
-    struct
-    {
-        /** Whether this driver's output streams are enabled or not.
-         *  This flag overrides all the attached stream statuses. */
-        bool                fEnabled;
-        /** Max. number of free output streams.
-         *  UINT32_MAX for unlimited streams. */
-        uint32_t            cStreamsFree;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-        RTLISTANCHOR        lstCB;
-#endif
-        /** The driver's output confguration (tweakable via CFGM). */
-        DRVAUDIOCFG         Cfg;
-    } Out;
-} DRVAUDIO, *PDRVAUDIO;
-
-/** Makes a PDRVAUDIO out of a PPDMIAUDIOCONNECTOR. */
-#define PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface) \
-    ( (PDRVAUDIO)((uintptr_t)pInterface - RT_UOFFSETOF(DRVAUDIO, IAudioConnector)) )
-
-/** @name Audio calculation helper methods.
- * @{ */
-uint32_t DrvAudioHlpCalcBitrate(uint8_t cBits, uint32_t uHz, uint8_t cChannels);
-/** @} */
-
-/** @name Audio PCM properties helper methods.
- * @{ */
-bool     DrvAudioHlpPcmPropsAreValid(PCPDMAUDIOPCMPROPS pProps);
-/** @}  */
-
-/** @name Audio configuration helper methods.
- * @{ */
-bool    DrvAudioHlpStreamCfgIsValid(PCPDMAUDIOSTREAMCFG pCfg);
-/** @}  */
-
-/** @name Audio file (name) helper methods.
- * @{ */
-int DrvAudioHlpFileNameSanitize(char *pszPath, size_t cbPath);
-int DrvAudioHlpFileNameGet(char *pszFile, size_t cchFile, const char *pszPath, const char *pszName, uint32_t uInstance,
-                           PDMAUDIOFILETYPE enmType, uint32_t fFlags);
-/** @}  */
-
-/** @name Audio string-ify methods.
- * @{ */
-PDMAUDIOFMT DrvAudioHlpStrToAudFmt(const char *pszFmt);
-/** @}  */
-
-/** @name Audio file methods.
- * @{ */
-int DrvAudioHlpFileCreate(PDMAUDIOFILETYPE enmType, const char *pszFile, uint32_t fFlags, PPDMAUDIOFILE *ppFile);
-void DrvAudioHlpFileDestroy(PPDMAUDIOFILE pFile);
-int DrvAudioHlpFileOpen(PPDMAUDIOFILE pFile, uint32_t fOpen, PCPDMAUDIOPCMPROPS pProps);
-int DrvAudioHlpFileClose(PPDMAUDIOFILE pFile);
-int DrvAudioHlpFileDelete(PPDMAUDIOFILE pFile);
-size_t DrvAudioHlpFileGetDataSize(PPDMAUDIOFILE pFile);
-bool DrvAudioHlpFileIsOpen(PPDMAUDIOFILE pFile);
-int DrvAudioHlpFileWrite(PPDMAUDIOFILE pFile, const void *pvBuf, size_t cbBuf, uint32_t fFlags);
-/** @}  */
-
-#define AUDIO_MAKE_FOURCC(c0, c1, c2, c3) RT_H2LE_U32_C(RT_MAKE_U32_FROM_U8(c0, c1, c2, c3))
-
-#endif /* !VBOX_INCLUDED_SRC_Audio_DrvAudio_h */
-
Index: trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp	(revision 88230)
@@ -43,5 +43,5 @@
 #include <stdlib.h>
 
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 #include "AudioMixBuffer.h"
 
Index: trunk/src/VBox/Devices/Audio/DrvAudioCommon.h
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvAudioCommon.h	(revision 88230)
+++ trunk/src/VBox/Devices/Audio/DrvAudioCommon.h	(revision 88230)
@@ -0,0 +1,77 @@
+/* $Id$ */
+/** @file
+ * Intermediate audio driver header.
+ */
+
+/*
+ * Copyright (C) 2006-2020 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef VBOX_INCLUDED_SRC_Audio_DrvAudioCommon_h
+#define VBOX_INCLUDED_SRC_Audio_DrvAudioCommon_h
+#ifndef RT_WITHOUT_PRAGMA_ONCE
+# pragma once
+#endif
+
+#include <limits.h>
+
+#include <iprt/circbuf.h>
+#include <iprt/critsect.h>
+#include <iprt/file.h>
+#include <iprt/path.h>
+
+#include <VBox/vmm/pdmdev.h>
+#include <VBox/vmm/pdm.h>
+#include <VBox/vmm/pdmaudioifs.h>
+
+/** @name Audio calculation helper methods.
+ * @{ */
+uint32_t DrvAudioHlpCalcBitrate(uint8_t cBits, uint32_t uHz, uint8_t cChannels);
+/** @} */
+
+/** @name Audio PCM properties helper methods.
+ * @{ */
+bool     DrvAudioHlpPcmPropsAreValid(PCPDMAUDIOPCMPROPS pProps);
+/** @}  */
+
+/** @name Audio configuration helper methods.
+ * @{ */
+bool    DrvAudioHlpStreamCfgIsValid(PCPDMAUDIOSTREAMCFG pCfg);
+/** @}  */
+
+/** @name Audio file (name) helper methods.
+ * @{ */
+int DrvAudioHlpFileNameSanitize(char *pszPath, size_t cbPath);
+int DrvAudioHlpFileNameGet(char *pszFile, size_t cchFile, const char *pszPath, const char *pszName, uint32_t uInstance,
+                           PDMAUDIOFILETYPE enmType, uint32_t fFlags);
+/** @}  */
+
+/** @name Audio string-ify methods.
+ * @{ */
+PDMAUDIOFMT DrvAudioHlpStrToAudFmt(const char *pszFmt);
+/** @}  */
+
+/** @name Audio file methods.
+ * @{ */
+int DrvAudioHlpFileCreate(PDMAUDIOFILETYPE enmType, const char *pszFile, uint32_t fFlags, PPDMAUDIOFILE *ppFile);
+void DrvAudioHlpFileDestroy(PPDMAUDIOFILE pFile);
+int DrvAudioHlpFileOpen(PPDMAUDIOFILE pFile, uint32_t fOpen, PCPDMAUDIOPCMPROPS pProps);
+int DrvAudioHlpFileClose(PPDMAUDIOFILE pFile);
+int DrvAudioHlpFileDelete(PPDMAUDIOFILE pFile);
+size_t DrvAudioHlpFileGetDataSize(PPDMAUDIOFILE pFile);
+bool DrvAudioHlpFileIsOpen(PPDMAUDIOFILE pFile);
+int DrvAudioHlpFileWrite(PPDMAUDIOFILE pFile, const void *pvBuf, size_t cbBuf, uint32_t fFlags);
+/** @}  */
+
+#define AUDIO_MAKE_FOURCC(c0, c1, c2, c3) RT_H2LE_U32_C(RT_MAKE_U32_FROM_U8(c0, c1, c2, c3))
+
+#endif /* !VBOX_INCLUDED_SRC_Audio_DrvAudioCommon_h */
+
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp	(revision 88230)
@@ -60,5 +60,4 @@
 #include <alsa/control.h> /* For device enumeration. */
 
-#include "DrvAudio.h"
 #include "VBoxDD.h"
 
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp	(revision 88230)
@@ -25,5 +25,4 @@
 #include <VBox/vmm/pdmaudiohostenuminline.h>
 
-#include "DrvAudio.h"
 #include "VBoxDD.h"
 
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp	(revision 88230)
@@ -33,5 +33,4 @@
 #include <VBox/vmm/pdmaudiohostenuminline.h>
 
-#include "DrvAudio.h"
 #include "VBoxDD.h"
 #ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioDebug.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioDebug.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioDebug.cpp	(revision 88230)
@@ -29,5 +29,5 @@
 #include <VBox/vmm/pdmaudioinline.h>
 
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 #include "VBoxDD.h"
 
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioNull.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioNull.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioNull.cpp	(revision 88230)
@@ -55,5 +55,4 @@
 #include <VBox/vmm/pdmaudioinline.h>
 
-#include "DrvAudio.h"
 #include "VBoxDD.h"
 
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp	(revision 88230)
@@ -31,5 +31,4 @@
 #include <VBox/vmm/pdmaudioinline.h>
 
-#include "DrvAudio.h"
 #include "VBoxDD.h"
 
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp	(revision 88230)
@@ -37,5 +37,4 @@
 #include <pulse/pulseaudio.h>
 
-#include "DrvAudio.h"
 #include "VBoxDD.h"
 
Index: trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp	(revision 88230)
@@ -25,5 +25,5 @@
 #include <VBox/vmm/pdmaudioinline.h>
 
-#include "DrvAudio.h"
+#include "DrvAudioCommon.h"
 #include "VBoxDD.h"
 
Index: trunk/src/VBox/Devices/Audio/VBoxMMNotificationClient.h
===================================================================
--- trunk/src/VBox/Devices/Audio/VBoxMMNotificationClient.h	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/VBoxMMNotificationClient.h	(revision 88230)
@@ -37,5 +37,4 @@
 #include <Mmdeviceapi.h>
 
-#include "DrvAudio.h"
 
 class VBoxMMNotificationClient : IMMNotificationClient
Index: trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp	(revision 88229)
+++ trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp	(revision 88230)
@@ -31,5 +31,5 @@
 
 #include "../AudioMixBuffer.h"
-#include "../DrvAudio.h"
+#include "../DrvAudioCommon.h"
 
 
