Optimized include/*.h: (recursively) include all headers needed by
this .h file, but only those. Necessary fixes to a lot of .c files,
started optimizing "windows.h" away from some of them. Moved
GetCurrentTask prototype to wine/winbase16.h.
diff --git a/dlls/msacm32/builtin.c b/dlls/msacm32/builtin.c
index 985c76f..3ba3339 100644
--- a/dlls/msacm32/builtin.c
+++ b/dlls/msacm32/builtin.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
index bee3d11..2d7411a 100644
--- a/dlls/msacm32/driver.c
+++ b/dlls/msacm32/driver.c
@@ -4,9 +4,10 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
+#include "winuser.h"
#include "debug.h"
#include "driver.h"
#include "heap.h"
diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c
index 45dc02c..b0fddca 100644
--- a/dlls/msacm32/filter.c
+++ b/dlls/msacm32/filter.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c
index 0cd2fc1..e780bd1 100644
--- a/dlls/msacm32/format.c
+++ b/dlls/msacm32/format.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c
index 62c60ae..f382a0a 100644
--- a/dlls/msacm32/internal.c
+++ b/dlls/msacm32/internal.c
@@ -4,7 +4,8 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
+#include "winuser.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c
index f1dc476..655c226 100644
--- a/dlls/msacm32/msacm32_main.c
+++ b/dlls/msacm32/msacm32_main.c
@@ -4,11 +4,10 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
-#include "mmsystem.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "winversion.h"
diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c
index d159478..21ca98b 100644
--- a/dlls/msacm32/stream.c
+++ b/dlls/msacm32/stream.c
@@ -4,7 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
-#include "windows.h"
+#include "winbase.h"
#include "winerror.h"
#include "wintypes.h"
#include "debug.h"
