diff --git a/reactos/drivers/sac/driver/CMakeLists.txt b/reactos/drivers/sac/driver/CMakeLists.txt
index 1a28f98b485..f07ff7ae3f2 100644
--- a/reactos/drivers/sac/driver/CMakeLists.txt
+++ b/reactos/drivers/sac/driver/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+include_directories(${REACTOS_SOURCE_DIR})
+
 list(APPEND SOURCE
      chanmgr.c
      channel.c
diff --git a/reactos/drivers/sac/driver/channel.c b/reactos/drivers/sac/driver/channel.c
index b91f8c1b706..19c1643ffc3 100644
--- a/reactos/drivers/sac/driver/channel.c
+++ b/reactos/drivers/sac/driver/channel.c
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 BOOLEAN
@@ -575,4 +573,3 @@ ChannelClose(IN PSAC_CHANNEL Channel)
     Status = ChannelDereferenceHandles(Channel);
     return Status;
 }
-
diff --git a/reactos/drivers/sac/driver/cmdchan.c b/reactos/drivers/sac/driver/cmdchan.c
index 6b8d9056b98..aa0640e2999 100644
--- a/reactos/drivers/sac/driver/cmdchan.c
+++ b/reactos/drivers/sac/driver/cmdchan.c
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/sac/driver/concmd.c b/reactos/drivers/sac/driver/concmd.c
index c3cbe68376d..252273afab2 100644
--- a/reactos/drivers/sac/driver/concmd.c
+++ b/reactos/drivers/sac/driver/concmd.c
@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <ndk/exfuncs.h>
+
 /* GLOBALS ********************************************************************/
 
 PVOID GlobalBuffer;
diff --git a/reactos/drivers/sac/driver/conmgr.c b/reactos/drivers/sac/driver/conmgr.c
index 4031d865296..fd738836074 100644
--- a/reactos/drivers/sac/driver/conmgr.c
+++ b/reactos/drivers/sac/driver/conmgr.c
@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <initguid.h>
+
 /* GLOBALS ********************************************************************/
 
 DEFINE_GUID(PRIMARY_SAC_CHANNEL_APPLICATION_GUID,
@@ -890,4 +892,3 @@ ConMgrHandleEvent(IN ULONG EventCode,
     ASSERT(FALSE);
     return STATUS_NOT_IMPLEMENTED;
 }
-
diff --git a/reactos/drivers/sac/driver/data.c b/reactos/drivers/sac/driver/data.c
index 14a894a0018..43e2292eae2 100644
--- a/reactos/drivers/sac/driver/data.c
+++ b/reactos/drivers/sac/driver/data.c
@@ -501,4 +501,3 @@ SuccessExit:
     SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting with status TRUE\n");
     return TRUE;
 }
-
diff --git a/reactos/drivers/sac/driver/init.c b/reactos/drivers/sac/driver/init.c
index d124b32cafb..974b67a80bc 100644
--- a/reactos/drivers/sac/driver/init.c
+++ b/reactos/drivers/sac/driver/init.c
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/sac/driver/rawchan.c b/reactos/drivers/sac/driver/rawchan.c
index 3aa148f6cbb..44fac1df970 100644
--- a/reactos/drivers/sac/driver/rawchan.c
+++ b/reactos/drivers/sac/driver/rawchan.c
@@ -10,8 +10,6 @@
 
 #include "sacdrv.h"
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/sac/driver/sacdrv.h b/reactos/drivers/sac/driver/sacdrv.h
index 69731ea2f3a..b844d174658 100644
--- a/reactos/drivers/sac/driver/sacdrv.h
+++ b/reactos/drivers/sac/driver/sacdrv.h
@@ -9,14 +9,8 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntifs.h>
-#include <intrin.h>
-#include <wchar.h>
 #include <stdio.h>
-#include <ndk/obtypes.h>
-#include <ndk/exfuncs.h>
-#include <ndk/rtlfuncs.h>
-#include <../../../ntoskrnl/include/internal/hdl.h>
-#include <initguid.h>
+#include <ntoskrnl/include/internal/hdl.h>
 #include <sacmsg.h>
 
 /* DEFINES ********************************************************************/
diff --git a/reactos/drivers/sac/driver/util.c b/reactos/drivers/sac/driver/util.c
index cc0a62f8fff..06738ea358b 100644
--- a/reactos/drivers/sac/driver/util.c
+++ b/reactos/drivers/sac/driver/util.c
@@ -10,6 +10,8 @@
 
 #include "sacdrv.h"
 
+#include <ndk/rtlfuncs.h>
+
 /* GLOBALS ********************************************************************/
 
 PCHAR Utf8ConversionBuffer;