Index: reactos/base/services/audiosrv/pnp.c
===================================================================
--- base/services/audiosrv/pnp.c	(revision 72961)
+++ base/services/audiosrv/pnp.c	(working copy)
@@ -12,6 +12,7 @@
 #include <winuser.h>
 #include <mmsystem.h>
 #include <setupapi.h>
+#include <ks.h>
 #include <ksmedia.h>
 
 static HDEVNOTIFY device_notification_handle = NULL;
Index: reactos/dll/win32/wdmaud.drv/wdmaud.h
===================================================================
--- dll/win32/wdmaud.drv/wdmaud.h	(revision 72961)
+++ dll/win32/wdmaud.drv/wdmaud.h	(working copy)
@@ -14,6 +14,7 @@
 #include <winuser.h>
 #include <mmddk.h>
 #include <mmebuddy.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include <interface.h>
 #include <devioctl.h>
Index: reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
===================================================================
--- drivers/wdm/audio/backpln/audio_test/audio_test.c	(revision 72961)
+++ drivers/wdm/audio/backpln/audio_test/audio_test.c	(working copy)
@@ -8,6 +8,7 @@
 #include <math.h>
 #include <setupapi.h>
 #include <ndk/umtypes.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include "interface.h"
 
Index: reactos/sdk/include/psdk/ksmedia.h
===================================================================
--- sdk/include/psdk/ksmedia.h	(revision 72962)
+++ sdk/include/psdk/ksmedia.h	(working copy)
@@ -5,11 +5,13 @@
     Please see COPYING in the top level directory for license information.
 */
 
+#ifndef _KS_
+#error ks.h needs to be included before ksmedia.h
+#endif /* _KS_ */
+
 #ifndef KSMEDIA_H
 #define KSMEDIA_H
 
-#include <ks.h>
-
 /*
     KS CATEGORIES
 */
Index: reactos/sdk/lib/drivers/sound/mmixer/precomp.h
===================================================================
--- sdk/lib/drivers/sound/mmixer/precomp.h	(revision 72961)
+++ sdk/lib/drivers/sound/mmixer/precomp.h	(working copy)
@@ -5,6 +5,7 @@
 #include <windef.h>
 #define NOBITMAP
 #include <mmreg.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include <mmsystem.h>
 
Index: rostests/winetests/amstream/amstream.c
===================================================================
--- modules/rostests/winetests/amstream/amstream.c	(revision 72961)
+++ modules/rostests/winetests/amstream/amstream.c	(working copy)
@@ -30,6 +30,7 @@
 #include <vfwmsgs.h>
 #include <objbase.h>
 #include <mmreg.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include <initguid.h>
 #include <amstream.h>
Index: rostests/winetests/dsound/ds3d8.c
===================================================================
--- modules/rostests/winetests/dsound/ds3d8.c	(revision 72961)
+++ modules/rostests/winetests/dsound/ds3d8.c	(working copy)
@@ -35,7 +35,7 @@
 #include <wingdi.h>
 #include <mmreg.h>
 #include <dsound.h>
-//#include "ks.h"
+#include <ks.h>
 #include <ksmedia.h>
 #include "dsound_test.h"
 
Index: rostests/winetests/dsound/dsound.c
===================================================================
--- modules/rostests/winetests/dsound/dsound.c	(revision 72961)
+++ modules/rostests/winetests/dsound/dsound.c	(working copy)
@@ -38,7 +38,7 @@
 #include <dsound.h>
 #include <dsconf.h>
 //#include "initguid.h"
-//#include "ks.h"
+#include <ks.h>
 #include <ksmedia.h>
 
 #include "dsound_test.h"
Index: rostests/winetests/dsound/dsound8.c
===================================================================
--- modules/rostests/winetests/dsound/dsound8.c	(revision 72961)
+++ modules/rostests/winetests/dsound/dsound8.c	(working copy)
@@ -39,7 +39,7 @@
 #include <mmreg.h>
 #include <dsound.h>
 #include <dsconf.h>
-//#include "ks.h"
+#include <ks.h>
 #include <ksmedia.h>
 #include <initguid.h>
 #include <mmdeviceapi.h>