diff --git a/dll/win32/iphlpapi/dhcp_reactos.c b/dll/win32/iphlpapi/dhcp_reactos.c
index 3364e3c9c7e..b72c945f2d5 100644
--- a/dll/win32/iphlpapi/dhcp_reactos.c
+++ b/dll/win32/iphlpapi/dhcp_reactos.c
@@ -12,9 +12,6 @@
 #include "dhcpcapi.h"
 #include <assert.h>
 
-#define NDEBUG
-#include "debug.h"
-
 DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex,
                                      PBOOL DhcpEnabled,
                                      PDWORD DhcpServer,
diff --git a/dll/win32/iphlpapi/ifenum_reactos.c b/dll/win32/iphlpapi/ifenum_reactos.c
index 8eec8a77b1f..0ffe129ebd0 100644
--- a/dll/win32/iphlpapi/ifenum_reactos.c
+++ b/dll/win32/iphlpapi/ifenum_reactos.c
@@ -40,9 +40,6 @@
 #include "ifenum.h"
 #include <assert.h>
 
-//#define NDEBUG
-#include "debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
 
 /* Functions */
diff --git a/dll/win32/iphlpapi/registry.c b/dll/win32/iphlpapi/registry.c
index e83fde95281..57af182db6f 100644
--- a/dll/win32/iphlpapi/registry.c
+++ b/dll/win32/iphlpapi/registry.c
@@ -1,7 +1,5 @@
 #include "iphlpapi_private.h"
 
-#include "debug.h"
-
 int GetLongestChildKeyName( HANDLE RegHandle ) {
   LONG Status;
   DWORD MaxAdapterName;
diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
index b505da5157f..e15954bac78 100644
--- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt
+++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
@@ -11,6 +11,7 @@ list(APPEND SOURCE
 add_library(drmk SHARED ${SOURCE})
 
 set_module_type(drmk kernelmodedriver)
+set_entrypoint(drmk 0)
 add_importlibs(drmk ntoskrnl)
 add_importlib_target(drmk.spec drmk.sys)
 
diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt
index 38b56a006ae..0c6f808890f 100644
--- a/drivers/wmi/CMakeLists.txt
+++ b/drivers/wmi/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND SOURCE
 add_library(wmilib SHARED ${SOURCE})
 
 set_module_type(wmilib kernelmodedriver)
-
+set_entrypoint(wmilib 0)
 add_importlibs(wmilib ntoskrnl)
 add_importlib_target(wmilib.spec wmilib.sys)