14 files changed, 19 insertions, 20 deletions
diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp
index 65108483..7dcfd6af 100644
--- a/src/server/BlockFactory.cpp
+++ b/src/server/BlockFactory.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "lilv/lilv.h"
 
diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp
index e2c202a8..e95645f9 100644
--- a/src/server/BlockImpl.cpp
+++ b/src/server/BlockImpl.cpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <assert.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstdint>
 
 #include "raul/Array.hpp"
 
diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index 287c6011..d609a2af 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -16,10 +16,10 @@
 
 #define __STDC_LIMIT_MACROS 1
 
-#include <math.h>
+#include <cmath>
+#include <cstdint>
+#include <cstring>
 #include <new>
-#include <stdint.h>
-#include <string.h>
 
 #ifdef __SSE__
 #    include <xmmintrin.h>
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 7feed87e..8d4d6974 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <math.h>
+#include <cmath>
 
 #include "ingen/Log.hpp"
 #include "ingen/URIMap.hpp"
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 756ddd66..3160f8b2 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -18,10 +18,11 @@
 #define INGEN_ENGINE_CONTROLBINDINGS_HPP
 
 #include <atomic>
+#include <cstdint>
+#include <vector>
+
 #include <boost/intrusive/options.hpp>
 #include <boost/intrusive/set.hpp>
-#include <stdint.h>
-#include <vector>
 
 #include "ingen/Atom.hpp"
 #include "ingen/types.hpp"
diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp
index 023761d6..2d4b9724 100644
--- a/src/server/EventWriter.hpp
+++ b/src/server/EventWriter.hpp
@@ -17,7 +17,6 @@
 #ifndef INGEN_ENGINE_EVENTWRITER_HPP
 #define INGEN_ENGINE_EVENTWRITER_HPP
 
-#include <inttypes.h>
 #include <memory>
 #include <string>
 
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index 054d55ae..53bed410 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -14,10 +14,9 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-
 #include <cassert>
 #include <cmath>
+#include <cstdint>
 
 #include <glibmm/miscutils.h>
 #include <glibmm/convert.h>
diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp
index 11772a88..b1545f64 100644
--- a/src/server/PortAudioDriver.hpp
+++ b/src/server/PortAudioDriver.hpp
@@ -21,9 +21,10 @@
 
 #include <atomic>
 #include <memory>
-#include <portaudio.h>
 #include <string>
 
+#include <portaudio.h>
+
 #include "raul/Semaphore.hpp"
 
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"
diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp
index f0a58b18..b275c36a 100644
--- a/src/server/PostProcessor.cpp
+++ b/src/server/PostProcessor.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <assert.h>
+#include <cassert>
 
 #include "Engine.hpp"
 #include "Event.hpp"
diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp
index eecc28d1..a6faa863 100644
--- a/src/server/SocketListener.cpp
+++ b/src/server/SocketListener.cpp
@@ -14,12 +14,12 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <errno.h>
 #include <poll.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <sstream>
 #include <string>
 #include <thread>
diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index e9667cc5..6b27ed83 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <limits.h>
+#include <climits>
 
 #include <cmath>
 
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index a0b2320b..4c1cf45a 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <math.h>
+#include <cmath>
 
 #include "ingen/URIs.hpp"
 #include "internals/Controller.hpp"
diff --git a/src/server/mix.hpp b/src/server/mix.hpp
index 58986750..3d8880db 100644
--- a/src/server/mix.hpp
+++ b/src/server/mix.hpp
@@ -17,7 +17,7 @@
 #ifndef INGEN_ENGINE_MIX_HPP
 #define INGEN_ENGINE_MIX_HPP
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace Ingen {
 
diff --git a/src/server/types.hpp b/src/server/types.hpp
index 3747e3ea..e7dae117 100644
--- a/src/server/types.hpp
+++ b/src/server/types.hpp
@@ -17,8 +17,7 @@
 #ifndef INGEN_ENGINE_TYPES_HPP
 #define INGEN_ENGINE_TYPES_HPP
 
-#include <stdint.h>
-#include <cstddef>
+#include <cstdint>
 
 typedef float    Sample;
 typedef uint32_t SampleCount;