diff --git a/reactos/dll/win32/mstask/factory.c b/reactos/dll/win32/mstask/factory.c
index 7459f516ceb..25ec76f3917 100644
--- a/reactos/dll/win32/mstask/factory.c
+++ b/reactos/dll/win32/mstask/factory.c
@@ -17,9 +17,6 @@
  */
 
 #include "mstask_private.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 struct ClassFactoryImpl
 {
diff --git a/reactos/dll/win32/mstask/mstask_main.c b/reactos/dll/win32/mstask/mstask_main.c
index 48d9788f706..512e0b278eb 100644
--- a/reactos/dll/win32/mstask/mstask_main.c
+++ b/reactos/dll/win32/mstask/mstask_main.c
@@ -16,17 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdio.h>
-
 #include "mstask_private.h"
-//#include "objbase.h"
+
 #include <rpcproxy.h>
 
-#include <wine/debug.h>
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
-
 static HINSTANCE hInst;
 LONG dll_ref = 0;
 
diff --git a/reactos/dll/win32/mstask/mstask_private.h b/reactos/dll/win32/mstask/mstask_private.h
index 6ef0cae2957..b8f50420851 100644
--- a/reactos/dll/win32/mstask/mstask_private.h
+++ b/reactos/dll/win32/mstask/mstask_private.h
@@ -19,20 +19,22 @@
 #ifndef __MSTASK_PRIVATE_H__
 #define __MSTASK_PRIVATE_H__
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
-
 #define COBJMACROS
 
 #include <windef.h>
 #include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
+#include <objbase.h>
 #include <mstask.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mstask);
+
 extern LONG dll_ref DECLSPEC_HIDDEN;
 
 typedef struct ClassFactoryImpl ClassFactoryImpl;
diff --git a/reactos/dll/win32/mstask/task.c b/reactos/dll/win32/mstask/task.c
index c88b65b11e6..fa4d098f69c 100644
--- a/reactos/dll/win32/mstask/task.c
+++ b/reactos/dll/win32/mstask/task.c
@@ -17,9 +17,6 @@
  */
 
 #include "mstask_private.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 typedef struct
 {
diff --git a/reactos/dll/win32/mstask/task_scheduler.c b/reactos/dll/win32/mstask/task_scheduler.c
index 20ff0e0a52c..9b981083ccf 100644
--- a/reactos/dll/win32/mstask/task_scheduler.c
+++ b/reactos/dll/win32/mstask/task_scheduler.c
@@ -16,15 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "mstask_private.h"
 
 #include <corerror.h>
-#include "mstask_private.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
 
 typedef struct
 {
diff --git a/reactos/dll/win32/mstask/task_trigger.c b/reactos/dll/win32/mstask/task_trigger.c
index 9ef185b361a..9e98232bc88 100644
--- a/reactos/dll/win32/mstask/task_trigger.c
+++ b/reactos/dll/win32/mstask/task_trigger.c
@@ -16,16 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-#include <winternl.h>
 #include "mstask_private.h"
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(mstask);
+#include <winternl.h>
 
 typedef struct
 {