diff --git a/Source/Memory.cc b/Source/Memory.cc
index dcaedfa..3490184 100644
--- a/Source/Memory.cc
+++ b/Source/Memory.cc
@@ -11,9 +11,9 @@
 // Prefaces                                                                   //
 //----------------------------------------------------------------------------//
 
+#include <cassert>
 #include "Process.h"
 #include "Memory.h"
-#include <assert.h>
 
 #include <algorithm>
 using std::search;
diff --git a/Source/Timer.cc b/Source/Timer.cc
index 088dbf7..4b69f76 100644
--- a/Source/Timer.cc
+++ b/Source/Timer.cc
@@ -14,7 +14,7 @@
 #include "Timer.h"
 #ifdef ROBOT_OS_LINUX
 
-	#include <time.h>
+	#include <ctime>
 	#include <unistd.h>
 
 #endif
diff --git a/Test/Peon.cc b/Test/Peon.cc
index 273ebe4..ee20c8f 100644
--- a/Test/Peon.cc
+++ b/Test/Peon.cc
@@ -17,7 +17,7 @@ using std::hex;
 using std::cout;
 using std::endl;
 
-#include <stdint.h>
+#include <cstdint>
 #include <cstring>
 #include <iomanip>
 using std::setw;