[MMSYS]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve the GUIDs situation.
* Improve the main header.
CORE-7716

svn path=/trunk/; revision=61697

reactos/dll/cpl/mmsys/mmsys.c

@@ -11,6 +11,13 @@
 
 #include "mmsys.h"
 
+#include <winsvc.h>
+#include <shlwapi.h>
+#include <debug.h>
+
+#include <initguid.h>
+#include <devguid.h>
+
 typedef enum
 {
     HWPD_STANDARDLIST = 0,

reactos/dll/cpl/mmsys/mmsys.h

@@ -1,23 +1,19 @@
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
-#include <winsvc.h>
 #include <winuser.h>
-#include <shellapi.h>
 #include <mmsystem.h>
 #include <cpl.h>
 #include <tchar.h>
-#include <initguid.h>
 #include <setupapi.h>
-#include <devguid.h>
-#include <debug.h>
-#include <shlwapi.h>
-#include <commdlg.h>
+
 #include "resource.h"
 
 //typedef LONG (CALLBACK *APPLET_PROC)(VOID);

reactos/dll/cpl/mmsys/sounds.c

@@ -9,6 +9,9 @@
 
 #include "mmsys.h"
 
+#include <commdlg.h>
+#include <debug.h>
+
 struct __APP_MAP__;
 
 typedef struct __LABEL_MAP__

reactos/dll/cpl/mmsys/volume.c

@@ -9,6 +9,8 @@
 
 #include "mmsys.h"
 
+#include <shellapi.h>
+
 #define VOLUME_DIVIDER 0xFFF
 
 typedef struct _IMGINFO