diff --git a/headers/private/kernel/util/DoublyLinkedList.h b/headers/private/kernel/util/DoublyLinkedList.h
index 1b594ec9ab..228d581854 100644
--- a/headers/private/kernel/util/DoublyLinkedList.h
+++ b/headers/private/kernel/util/DoublyLinkedList.h
@@ -7,7 +7,10 @@
 
 
 #include <SupportDefs.h>
-#include <util/kernel_cpp.h>
+
+#ifdef _KERNEL_MODE
+#	include <util/kernel_cpp.h>
+#endif
 
 
 #ifdef __cplusplus
diff --git a/src/kits/debug/SymbolLookup.cpp b/src/kits/debug/SymbolLookup.cpp
index c749048890..c3b0b7a468 100644
--- a/src/kits/debug/SymbolLookup.cpp
+++ b/src/kits/debug/SymbolLookup.cpp
@@ -3,10 +3,13 @@
  * Distributed under the terms of the MIT License.
  */
 
+#include "SymbolLookup.h"
+
+#include <new>
+
 #include <string.h>
 #include <runtime_loader.h>
 
-#include "SymbolLookup.h"
 
 using std::nothrow;
 using namespace BPrivate;
diff --git a/src/servers/app/ServerBitmap.cpp b/src/servers/app/ServerBitmap.cpp
index cc75c9a188..87aca3752c 100644
--- a/src/servers/app/ServerBitmap.cpp
+++ b/src/servers/app/ServerBitmap.cpp
@@ -16,6 +16,7 @@
 
 #include <new>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 using std::nothrow;