diff --git a/lib/BlockArray.cpp b/lib/BlockArray.cpp
index 3ffd83f..45b4346 100644
--- a/lib/BlockArray.cpp
+++ b/lib/BlockArray.cpp
@@ -30,7 +30,7 @@
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 
 
 using namespace Konsole;
diff --git a/lib/Emulation.cpp b/lib/Emulation.cpp
index bd75af3..4e8b1a3 100644
--- a/lib/Emulation.cpp
+++ b/lib/Emulation.cpp
@@ -23,8 +23,8 @@
 #include "Emulation.h"
 
 // System
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 #include <string>
 
diff --git a/lib/Emulation.h b/lib/Emulation.h
index 9fa179c..cc0c668 100644
--- a/lib/Emulation.h
+++ b/lib/Emulation.h
@@ -24,7 +24,7 @@
 #define EMULATION_H
 
 // System
-#include <stdio.h>
+#include <cstdio>
 
 // Qt
 #include <QKeyEvent>
diff --git a/lib/History.cpp b/lib/History.cpp
index 9cbf498..33b72e7 100644
--- a/lib/History.cpp
+++ b/lib/History.cpp
@@ -23,12 +23,12 @@
 
 // System
 #include <iostream>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 
 #include <QtDebug>
 
diff --git a/lib/KeyboardTranslator.cpp b/lib/KeyboardTranslator.cpp
index 32d5287..ebc2084 100644
--- a/lib/KeyboardTranslator.cpp
+++ b/lib/KeyboardTranslator.cpp
@@ -23,8 +23,8 @@
 #include "KeyboardTranslator.h"
 
 // System
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 
 // Qt
 #include <QBuffer>
diff --git a/lib/Pty.cpp b/lib/Pty.cpp
index 714101f..e3cc62f 100644
--- a/lib/Pty.cpp
+++ b/lib/Pty.cpp
@@ -33,9 +33,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <termios.h>
-#include <signal.h>
+#include <csignal>
 
 // Qt
 #include <QStringList>
diff --git a/lib/Screen.cpp b/lib/Screen.cpp
index cb88fd3..d07bb4f 100644
--- a/lib/Screen.cpp
+++ b/lib/Screen.cpp
@@ -24,11 +24,11 @@
 #include "Screen.h"
 
 // Standard
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
 
 // Qt
 #include <QTextStream>
diff --git a/lib/Session.cpp b/lib/Session.cpp
index 4146459..71a3b87 100644
--- a/lib/Session.cpp
+++ b/lib/Session.cpp
@@ -26,7 +26,7 @@
 #include "Session.h"
 
 // Standard
-#include <stdlib.h>
+#include <cstdlib>
 
 // Qt
 #include <QApplication>
diff --git a/lib/Vt102Emulation.cpp b/lib/Vt102Emulation.cpp
index 622550e..13d7ded 100644
--- a/lib/Vt102Emulation.cpp
+++ b/lib/Vt102Emulation.cpp
@@ -38,7 +38,7 @@
 #endif
 
 // Standard
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 // Qt
diff --git a/lib/Vt102Emulation.h b/lib/Vt102Emulation.h
index 1ffa3a2..99c98e2 100644
--- a/lib/Vt102Emulation.h
+++ b/lib/Vt102Emulation.h
@@ -24,7 +24,7 @@
 #define VT102EMULATION_H
 
 // Standard Library
-#include <stdio.h>
+#include <cstdio>
 
 // Qt
 #include <QKeyEvent>
diff --git a/lib/kprocess.cpp b/lib/kprocess.cpp
index 73264a6..e9c3b46 100644
--- a/lib/kprocess.cpp
+++ b/lib/kprocess.cpp
@@ -35,7 +35,7 @@
 # include <windows.h>
 #else
 # include <unistd.h>
-# include <errno.h>
+# include <cerrno>
 #endif
 
 #ifndef Q_OS_WIN
diff --git a/lib/kpty.cpp b/lib/kpty.cpp
index 2b70dd2..f7386d1 100644
--- a/lib/kpty.cpp
+++ b/lib/kpty.cpp
@@ -70,12 +70,12 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <time.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <ctime>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <grp.h>
 
diff --git a/lib/kptydevice.cpp b/lib/kptydevice.cpp
index 983d4ea..2c505e9 100644
--- a/lib/kptydevice.cpp
+++ b/lib/kptydevice.cpp
@@ -35,8 +35,8 @@
 #include <QSocketNotifier>
 
 #include <unistd.h>
-#include <errno.h>
-#include <signal.h>
+#include <cerrno>
+#include <csignal>
 #include <termios.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/lib/kptyprocess.cpp b/lib/kptyprocess.cpp
index ec8df33..b61fd53 100644
--- a/lib/kptyprocess.cpp
+++ b/lib/kptyprocess.cpp
@@ -32,9 +32,9 @@
 #include "kprocess.h"
 #include "kptydevice.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
-#include <signal.h>
+#include <csignal>
 #include <QDebug>
 
 KPtyProcess::KPtyProcess(QObject *parent) :
diff --git a/lib/kptyprocess.h b/lib/kptyprocess.h
index 0d3a04a..ae1166e 100644
--- a/lib/kptyprocess.h
+++ b/lib/kptyprocess.h
@@ -33,7 +33,7 @@
 #include "kprocess.h"
 #include "kptydevice.h"
 
-#include <signal.h>
+#include <csignal>
 
 class KPtyDevice;