diff --git a/src/apps/installer/CopyEngine.cpp b/src/apps/installer/CopyEngine.cpp
index 33b635561d..345051215d 100644
--- a/src/apps/installer/CopyEngine.cpp
+++ b/src/apps/installer/CopyEngine.cpp
@@ -8,6 +8,7 @@
 #include "PartitionMenuItem.h"
 #include "FSUndoRedo.h"
 #include "FSUtils.h"
+#include <stdio.h>
 #include <Alert.h>
 #include <DiskDeviceVisitor.h>
 #include <DiskDeviceTypes.h>
diff --git a/src/apps/installer/InstallerCopyLoopControl.cpp b/src/apps/installer/InstallerCopyLoopControl.cpp
index ea64fae341..da060ec013 100644
--- a/src/apps/installer/InstallerCopyLoopControl.cpp
+++ b/src/apps/installer/InstallerCopyLoopControl.cpp
@@ -5,6 +5,7 @@
  */
 #include "InstallerCopyLoopControl.h"
 #include "InstallerWindow.h"
+#include <stdio.h>
 #include <Alert.h>
 
 InstallerCopyLoopControl::InstallerCopyLoopControl(InstallerWindow *window)
diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp
index 76f2e9874f..a38d5e6376 100644
--- a/src/apps/installer/InstallerWindow.cpp
+++ b/src/apps/installer/InstallerWindow.cpp
@@ -3,6 +3,9 @@
  * Distributed under the terms of the MIT License.
  */
 
+#include "InstallerWindow.h"
+#include <stdio.h>
+#include <string.h>
 #include <Alert.h>
 #include <Application.h>
 #include <Autolock.h>
@@ -12,11 +15,9 @@
 #include <Path.h>
 #include <PopUpMenu.h>
 #include <Roster.h>
-#include <string.h>
 #include <String.h>
 #include <TranslationUtils.h>
 #include <TranslatorFormats.h>
-#include "InstallerWindow.h"
 #include "PartitionMenuItem.h"
 
 #define DRIVESETUP_SIG "application/x-vnd.Haiku-DriveSetup"
diff --git a/src/bin/mountvolume.cpp b/src/bin/mountvolume.cpp
index 3009e02467..3a7caa1f08 100644
--- a/src/bin/mountvolume.cpp
+++ b/src/bin/mountvolume.cpp
@@ -5,6 +5,7 @@
 
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <set>
diff --git a/src/preferences/keymap/KeyboardLayout.cpp b/src/preferences/keymap/KeyboardLayout.cpp
index e867e1d40c..a04566f3b9 100644
--- a/src/preferences/keymap/KeyboardLayout.cpp
+++ b/src/preferences/keymap/KeyboardLayout.cpp
@@ -8,6 +8,8 @@
 
 #include <ctype.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <vector>
 
 #include <File.h>
diff --git a/src/preferences/keymap/KeyboardLayoutView.cpp b/src/preferences/keymap/KeyboardLayoutView.cpp
index 84e6d29c83..b070352e35 100644
--- a/src/preferences/keymap/KeyboardLayoutView.cpp
+++ b/src/preferences/keymap/KeyboardLayoutView.cpp
@@ -6,6 +6,9 @@
 
 #include "KeyboardLayoutView.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <Beep.h>
 #include <Bitmap.h>
 #include <ControlLook.h>
diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp
index 35956b355a..847777fbc6 100644
--- a/src/preferences/keymap/KeymapWindow.cpp
+++ b/src/preferences/keymap/KeymapWindow.cpp
@@ -12,6 +12,7 @@
 #include "KeymapWindow.h"
 
 #include <string.h>
+#include <stdio.h>
 
 #include <Alert.h>
 #include <Button.h>
diff --git a/src/servers/app/BitmapManager.cpp b/src/servers/app/BitmapManager.cpp
index 954626cc02..d73beba905 100644
--- a/src/servers/app/BitmapManager.cpp
+++ b/src/servers/app/BitmapManager.cpp
@@ -35,6 +35,7 @@
 
 #include <new>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 using std::nothrow;
diff --git a/src/servers/app/ClientMemoryAllocator.cpp b/src/servers/app/ClientMemoryAllocator.cpp
index acbab6fb92..2be9f57ddb 100644
--- a/src/servers/app/ClientMemoryAllocator.cpp
+++ b/src/servers/app/ClientMemoryAllocator.cpp
@@ -25,6 +25,7 @@
 #include "ClientMemoryAllocator.h"
 #include "ServerApp.h"
 
+#include <stdio.h>
 #include <stdlib.h>