diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2683eb83..7bc791408 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,6 @@ add_subdirectory(plugins/libimhex)
 # Add include directories
 include_directories(include ${CRYPTO_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS})
 
-message(${CAPSTONE_INCLUDE_DIRS})
-
 detectOS()
 detectArch()
 
diff --git a/include/helpers/disassembler.hpp b/include/helpers/disassembler.hpp
index 0ff8b96bb..03f6a8bcd 100644
--- a/include/helpers/disassembler.hpp
+++ b/include/helpers/disassembler.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
+#if __has_include(<capstone/capstone.h>)
 #include <capstone/capstone.h>
+#else
+#include <capstone.h>
+#endif
 #include <hex.hpp>
 
 namespace hex {
diff --git a/include/views/view_disassembler.hpp b/include/views/view_disassembler.hpp
index 054082e63..8349e67c4 100644
--- a/include/views/view_disassembler.hpp
+++ b/include/views/view_disassembler.hpp
@@ -4,8 +4,6 @@
 
 #include "helpers/disassembler.hpp"
 
-#include <capstone/capstone.h>
-
 #include <cstdio>
 #include <string>
 #include <vector>