diff --git a/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp b/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp
index 1048d810c7..887d13d8cf 100644
--- a/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp
+++ b/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp
@@ -9,16 +9,17 @@
 #include <PPPControl.h>
 #include <KPPPUtils.h>
 
-#include <kernel_cpp.h>
 #include <LockerHelper.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/sockio.h>
 
 
 #ifdef _KERNEL_MODE
 	#define spawn_thread spawn_kernel_thread
 	#define printf dprintf
+#else
+	#include <cstdio>
 #endif
 
 
diff --git a/src/add-ons/kernel/network/interfaces/ppp/ppp.cpp b/src/add-ons/kernel/network/interfaces/ppp/ppp.cpp
index 9dfde9c9af..0f92ac8d54 100644
--- a/src/add-ons/kernel/network/interfaces/ppp/ppp.cpp
+++ b/src/add-ons/kernel/network/interfaces/ppp/ppp.cpp
@@ -9,8 +9,6 @@
 #include <KernelExport.h>
 #include <driver_settings.h>
 
-#include <kernel_cpp.h>
-
 #include <PPPDefs.h>
 #include "PPPManager.h"
 
diff --git a/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp b/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp
index 200b1442e9..ddac4b4d4d 100644
--- a/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp
+++ b/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp
@@ -8,7 +8,6 @@
 #include "DiscoveryPacket.h"
 
 #include <core_funcs.h>
-#include <kernel_cpp.h>
 
 
 DiscoveryPacket::DiscoveryPacket(uint8 code, uint16 sessionID = 0x0000)
diff --git a/src/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/add-ons/kernel/network/ppp/pppoe/Jamfile
index d834414da6..bdbd2e7cce 100644
--- a/src/add-ons/kernel/network/ppp/pppoe/Jamfile
+++ b/src/add-ons/kernel/network/ppp/pppoe/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src add-ons kernel network ppp pppoe ;
 
-# for kernel_cpp.cpp/h and BLocker
+# for kernel_cpp.h and BLocker
 UsePrivateHeaders net ;
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
diff --git a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
index 32da78f15e..bf04226148 100644
--- a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
+++ b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
@@ -10,7 +10,6 @@
 
 #include <core_funcs.h>
 #include <cstdlib>
-#include <kernel_cpp.h>
 
 // from libkernelppp
 #include <settings_tools.h>
diff --git a/src/add-ons/kernel/network/ppp/pppoe/pppoe.cpp b/src/add-ons/kernel/network/ppp/pppoe/pppoe.cpp
index 718fddaf88..5132056d86 100644
--- a/src/add-ons/kernel/network/ppp/pppoe/pppoe.cpp
+++ b/src/add-ons/kernel/network/ppp/pppoe/pppoe.cpp
@@ -9,8 +9,6 @@
 #include <KernelExport.h>
 #include <driver_settings.h>
 
-#include <kernel_cpp.h>
-
 #include <ethernet_module.h>
 
 #include <KPPPInterface.h>
diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
index fbae18afa3..8d412004d8 100644
--- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
+++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
@@ -1,14 +1,14 @@
 SubDir OBOS_TOP src add-ons kernel network ppp shared libkernelppp ;
 
-# for kernel_cpp.cpp/h and BLocker
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core util ] ;
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
-
 UsePrivateHeaders net ;
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
 
+# for kernel_cpp.cpp/h and BLocker
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core util ] ;
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
+
 
 R5KernelStaticLibrary kernelppp :
 	kernel_cpp.cpp
diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp
index 39c79ba38a..27280f4235 100644
--- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp
+++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp
@@ -5,7 +5,7 @@
 //  Copyright (c) 2003 Waldemar Kornewald, Waldemar.Kornewald@web.de
 //---------------------------------------------------------------------
 
-// stdio.h must be included before PPPModule.h/PPPManager.h because
+// cstdio must be included before PPPModule.h/PPPManager.h because
 // dprintf is defined twice with different return values, once with
 // void (KernelExport.h) and once with int (stdio.h).
 #include <cstdio>
diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/List.h b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/List.h
index e865fc27ca..1bed99e70e 100644
--- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/List.h
+++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/List.h
@@ -30,6 +30,8 @@
 
 #ifdef _KERNEL_MODE
 	#include <kernel_cpp.h>
+#else
+	#include <new.h>
 #endif
 
 #include <stdlib.h>