diff --git a/VerteronDisassemblerEngine/VXDisassemblerUtils.cpp b/VerteronDisassemblerEngine/VXDisassemblerUtils.cpp
index 8e7fa65..f8d640f 100644
--- a/VerteronDisassemblerEngine/VXDisassemblerUtils.cpp
+++ b/VerteronDisassemblerEngine/VXDisassemblerUtils.cpp
@@ -30,7 +30,7 @@
 
 **************************************************************************************************/
 #include "VXDisassemblerUtils.h"
-#include <assert.h>
+#include <cassert>
 
 namespace Verteron
 {
diff --git a/VerteronDisassemblerEngine/VXInstructionDecoder.cpp b/VerteronDisassemblerEngine/VXInstructionDecoder.cpp
index 1534af1..d6537d8 100644
--- a/VerteronDisassemblerEngine/VXInstructionDecoder.cpp
+++ b/VerteronDisassemblerEngine/VXInstructionDecoder.cpp
@@ -30,7 +30,7 @@
 
 **************************************************************************************************/
 #include "VXInstructionDecoder.h"
-#include <string.h>
+#include <cstring>
 
 namespace Verteron
 {
diff --git a/VerteronDisassemblerEngine/VXOpcodeTable.h b/VerteronDisassemblerEngine/VXOpcodeTable.h
index 9824d37..bf13060 100644
--- a/VerteronDisassemblerEngine/VXOpcodeTable.h
+++ b/VerteronDisassemblerEngine/VXOpcodeTable.h
@@ -31,8 +31,8 @@
 **************************************************************************************************/
 #pragma once
 
-#include "stdint.h"
-#include "assert.h"
+#include <stdint.h>
+#include <cassert>
 
 namespace Verteron
 {