diff --git a/src/History.cpp b/src/History.cpp
index 94a05201d..a3c902c26 100644
--- a/src/History.cpp
+++ b/src/History.cpp
@@ -25,9 +25,9 @@
 #include "KonsoleSettings.h"
 
 // System
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstdlib>
+#include <cstdio>
 #include <sys/types.h>
 
 // KDE
diff --git a/src/KeyboardTranslator.cpp b/src/KeyboardTranslator.cpp
index 6f350391d..f0b4c3be5 100644
--- a/src/KeyboardTranslator.cpp
+++ b/src/KeyboardTranslator.cpp
@@ -25,8 +25,8 @@
 #include "konsoledebug.h"
 
 // System
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 
 // Qt
 #include <QBuffer>
diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp
index 34dfd5e6d..7194eefad 100644
--- a/src/ProcessInfo.cpp
+++ b/src/ProcessInfo.cpp
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/param.h>
-#include <errno.h>
+#include <cerrno>
 
 // Qt
 #include <QDir>
diff --git a/src/Pty.cpp b/src/Pty.cpp
index 019a7af01..a6eb84078 100644
--- a/src/Pty.cpp
+++ b/src/Pty.cpp
@@ -25,7 +25,7 @@
 
 // System
 #include <termios.h>
-#include <signal.h>
+#include <csignal>
 
 // Qt
 #include <QStringList>
diff --git a/src/Session.cpp b/src/Session.cpp
index 300f10808..9e6019494 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -25,8 +25,8 @@
 #include "Session.h"
 
 // Standard
-#include <stdlib.h>
-#include <signal.h>
+#include <cstdlib>
+#include <csignal>
 #include <unistd.h>
 
 // Qt
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 66c03fcda..812c52352 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -79,7 +79,7 @@
 #include "TerminalCharacterDecoder.h"
 
 // For Unix signal names
-#include <signal.h>
+#include <csignal>
 
 using namespace Konsole;
 
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index b7a5ff9c7..73de3a809 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -24,7 +24,7 @@
 #include "Vt102Emulation.h"
 
 // Standard
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 // Qt
diff --git a/tools/fontembedder.cpp b/tools/fontembedder.cpp
index 1fa13c708..7c6f2fbb2 100644
--- a/tools/fontembedder.cpp
+++ b/tools/fontembedder.cpp
@@ -19,7 +19,7 @@
 */
 
 // Standard
-#include <stdlib.h>
+#include <cstdlib>
 #include <iostream>
 #include <iomanip>