diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cb0e2fb..a128e1d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,18 +13,13 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set(X_TOOLS_QT_COMPONENTS
-    Core
-    Gui
-    Widgets
-    WebSockets
-    Network)
+set(X_TOOLS_QT_COMPONENTS Core Gui Widgets WebSockets Network)
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    list(APPEND X_TOOLS_QT_COMPONENTS SerialPort)
-    list(APPEND X_TOOLS_QT_COMPONENTS SerialBus)
-    add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALPORT)
-    add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALBUS)
+  list(APPEND X_TOOLS_QT_COMPONENTS SerialPort)
+  list(APPEND X_TOOLS_QT_COMPONENTS SerialBus)
+  add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALPORT)
+  add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALBUS)
 endif()
 
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS ${X_TOOLS_QT_COMPONENTS})
@@ -73,6 +68,7 @@ list(APPEND X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Assistants/xToolsAssistant
 list(APPEND X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Assistants/xToolsAssistantFactory.cpp)
 list(APPEND X_TOOLS_SOURCE ${X_TOOLS_CMAKE_FILES})
 
+include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants)
 include_directories(${CMAKE_SOURCE_DIR}/Source/Common/Common)
 include_directories(${CMAKE_SOURCE_DIR}/Source/Common/CommonUI)
 include_directories(${CMAKE_SOURCE_DIR}/Source/Tools/Tools)
@@ -80,6 +76,9 @@ include_directories(${CMAKE_SOURCE_DIR}/Source/Tools/ToolsUI)
 include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBox)
 include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBoxUI)
 
+set(WITH_GFLAGS OFF)
+set(BUILD_SHARED_LIBS OFF)
+
 sak_add_subdirectory("glog-0.7.0")
 sak_add_subdirectory("Qt-AES-master")
 sak_add_subdirectory("nodeeditor-3.0.10")
@@ -92,8 +91,8 @@ target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
 target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Network)
 target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::WebSockets)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
-target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialPort)
-target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialBus)
+  target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialPort)
+  target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialBus)
 endif()
 target_link_libraries(xTools PRIVATE qmdnsengine)
 target_link_libraries(xTools PRIVATE glog::glog)
diff --git a/Source/mainwindow.cc b/Source/mainwindow.cc
index 4f459ecb..feebf7df 100644
--- a/Source/mainwindow.cc
+++ b/Source/mainwindow.cc
@@ -35,13 +35,13 @@
 #include <QToolButton>
 #include <QVariant>
 
-#include "sakassistantsfactory.h"
 #include "sakdatastructure.h"
 #include "sakinterface.h"
 #include "saksettings.h"
 #include "saktoolboxui.h"
 #include "saktranslator.h"
 #include "sakuiinterface.h"
+#include "xToolsAssistantFactory.h"
 
 #ifdef SAK_IMPORT_MODULE_CANBUSSTUDIO
 #include "sakcanbusstudioui.h"