diff --git a/hyperdbg/CMakeLists.txt b/hyperdbg/CMakeLists.txt
index dce26678..bf2267a7 100644
--- a/hyperdbg/CMakeLists.txt
+++ b/hyperdbg/CMakeLists.txt
@@ -7,7 +7,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 if(LINUX)
 
-  add_subdirectory(script-engine)
     message(STATUS "Building on Linux")
 elseif(WIN32)
     message(STATUS "Building on Windows")
@@ -53,36 +52,29 @@ target_link_libraries(hyperhv Zycore Zydis)
 add_subdirectory(hyperkd)
 target_link_libraries(hyperkd hyperlog hyperhv kdserial)
 
+endif()
 
-add_subdirectory(dependencies/pdbex/Source)
+#add_subdirectory(dependencies/pdbex/Source)
 
-add_subdirectory(symbol-parser)
-target_link_libraries(symbol-parser pdbex)
+#add_subdirectory(symbol-parser)
+#target_link_libraries(symbol-parser pdbex)
 
+#target_link_libraries(script-engine symbol-parser)
 
-target_link_libraries(script-engine symbol-parser)
-
-link_directories(libraries/zydis/user libraries/keystone/release-lib)
-add_subdirectory(libhyperdbg)
-target_link_libraries(libhyperdbg Zycore Zydis script-engine keystone)
-
-
-add_subdirectory(hyperdbg-test)
+#add_subdirectory(hyperdbg-test)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
-add_subdirectory(symbol-parser)
-target_link_libraries(symbol-parser pdbex)
+#add_subdirectory(symbol-parser)
+#target_link_libraries(symbol-parser pdbex)
 
+#add_subdirectory(script-engine)
+#target_link_libraries(script-engine symbol-parser)
 
 add_subdirectory(script-engine)
-target_link_libraries(script-engine symbol-parser)
-
 link_directories(libraries/zydis/user libraries/keystone/release-lib)
 add_subdirectory(libhyperdbg)
 target_link_libraries(libhyperdbg Zycore Zydis script-engine keystone)
-endif()
-
 
 add_subdirectory(hyperdbg-cli)
 target_link_libraries(hyperdbg-cli libhyperdbg)
diff --git a/hyperdbg/libhyperdbg/CMakeLists.txt b/hyperdbg/libhyperdbg/CMakeLists.txt
index 91d5ce95..29324cff 100644
--- a/hyperdbg/libhyperdbg/CMakeLists.txt
+++ b/hyperdbg/libhyperdbg/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Code generated by Visual Studio kit, DO NOT EDIT.
 set(SourceFiles
-    "../include/platform/user/header/Environment.h"
+    "../include/platform/general/header/Environment.h"
     "../include/platform/user/header/Windows.h"
     "header/assembler.h"
     "header/commands.h"
@@ -27,6 +27,8 @@ set(SourceFiles
     "header/transparency.h"
     "header/ud.h"
     "pch.h"
+    "../include/platform/user/code/platform-intrinsics.c"
+    "../include/platform/user/code/platform-lib-calls.c"
     "../script-eval/code/Functions.c"
     "../script-eval/code/Keywords.c"
     "../script-eval/code/PseudoRegisters.c"
@@ -166,4 +168,15 @@ include_directories(
     "../script-eval"
     "../dependencies/keystone/include"
 )
+set_source_files_properties(
+    "../include/platform/user/code/platform-intrinsics.c"
+    "../include/platform/user/code/platform-lib-calls.c"
+    "../script-eval/code/Functions.c"
+    "../script-eval/code/Keywords.c"
+    "../script-eval/code/PseudoRegisters.c"
+    "../script-eval/code/Regs.c"
+    "../script-eval/code/ScriptEngineEval.c"
+    PROPERTIES LANGUAGE CXX
+)
+
 add_library(libhyperdbg SHARED ${SourceFiles})