--- akode/akodeplay/akodeplay.cpp
+++ akode/akodeplay/akodeplay.cpp
@@ -30,6 +30,7 @@
 #else
   #include <unistd.h>
 #endif
+#include <cstdlib>
 
 using namespace std;
 using namespace aKode;
--- akode/lib/audioframe.h
+++ akode/lib/audioframe.h
@@ -23,7 +23,7 @@
 
 #include "akodelib.h"
 #include "audioconfiguration.h"
-#include <assert.h>
+#include <cassert>
 
 namespace aKode {
 
--- akode/lib/auto_sink.cpp
+++ akode/lib/auto_sink.cpp
@@ -22,6 +22,7 @@
 #include "auto_sink.h"
 
 #include <iostream>
+#include <cstdlib>
 
 namespace aKode {
 
--- akode/lib/buffered_decoder.cpp
+++ akode/lib/buffered_decoder.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <pthread.h>
-#include <assert.h>
+#include <cassert>
 
 #include "audioframe.h"
 #include "audiobuffer.h"
--- akode/lib/magic.cpp
+++ akode/lib/magic.cpp
@@ -22,6 +22,7 @@
 #include "magic.h"
 #include "file.h"
 #include <iostream>
+#include <cstring>
 using std::cerr;
 
 namespace aKode {
--- akode/lib/player.cpp
+++ akode/lib/player.cpp
@@ -20,7 +20,8 @@
 
 #include <pthread.h>
 #include <semaphore.h>
-#include <assert.h>
+#include <cassert>
+#include <cstring>
 
 #include "audioframe.h"
 #include "audiobuffer.h"
--- akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
+++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
@@ -25,7 +25,7 @@
 #include "audioframe.h"
 #include "decoder.h"
 
-#include <assert.h>
+#include <cassert>
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/avformat.h>
 #include <ffmpeg/avio.h>
--- akode/plugins/mpc_decoder/mppdec/mpc_dec.h
+++ akode/plugins/mpc_decoder/mppdec/mpc_dec.h
@@ -7,7 +7,7 @@
 #endif
 
 
-#include <assert.h>
+#include <cassert>
 
 #include "mpc_math.h"
 
--- akode/plugins/mpc_decoder/mppdec/stdafx.h
+++ akode/plugins/mpc_decoder/mppdec/stdafx.h
@@ -12,8 +12,8 @@
 #endif // _MSC_VER > 1000
 #endif // _MSC_VER
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <string.h>
 #include <math.h>
 
--- akode/plugins/mpc_decoder/mppdec/synth_filter.cpp
+++ akode/plugins/mpc_decoder/mppdec/synth_filter.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 
-typedef int ptrdiff_t;
 
 
 /* C O N S T A N T S */
--- akode/plugins/oss_sink/oss_sink.cpp
+++ akode/plugins/oss_sink/oss_sink.cpp
@@ -27,7 +27,7 @@
 #endif
 
 #include <sys/ioctl.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <unistd.h>
 
--- akode/plugins/sun_sink/sun_sink.cpp
+++ akode/plugins/sun_sink/sun_sink.cpp
@@ -23,7 +23,7 @@
 #include <sys/audioio.h>
 
 #include <sys/ioctl.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <unistd.h>
 #include <alloca.h>
--- akode/plugins/xiph_decoder/speex_decoder.cpp
+++ akode/plugins/xiph_decoder/speex_decoder.cpp
@@ -24,7 +24,7 @@
 
 extern "C" {
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <speex.h>
 #include <speex_header.h>
 #include <speex_callbacks.h>