diff --git a/Source/Assistants/ASCII/main.cpp b/Source/Assistants/ASCII/main.cpp
index abc62160..4f417d32 100644
--- a/Source/Assistants/ASCII/main.cpp
+++ b/Source/Assistants/ASCII/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsAsciiAssistant.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Source/Assistants/Base64/main.cpp b/Source/Assistants/Base64/main.cpp
index b90e5ac2..be2d84c4 100644
--- a/Source/Assistants/Base64/main.cpp
+++ b/Source/Assistants/Base64/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsBase64Assisatnt.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Source/Assistants/Broadcast/main.cpp b/Source/Assistants/Broadcast/main.cpp
index f8f3ab6a..1fea2d93 100644
--- a/Source/Assistants/Broadcast/main.cpp
+++ b/Source/Assistants/Broadcast/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsBroadcastAssistant.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Source/Assistants/CMakeLists.txt b/Source/Assistants/CMakeLists.txt
index 583627ba..62fc7dfd 100644
--- a/Source/Assistants/CMakeLists.txt
+++ b/Source/Assistants/CMakeLists.txt
@@ -1,12 +1,10 @@
 set(X_TOOLS_COMMON_PATH ${CMAKE_SOURCE_DIR}/Source/Common)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/Common/xToolsInterface.h)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/Common/xToolsInterface.cpp)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/Common/xToolsSettings.h)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/Common/xToolsSettings.cpp)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/CommonUI/xToolsMainWindow.h)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/CommonUI/xToolsMainWindow.cpp)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/CommonUI/xToolsApplication.h)
-list(APPEND X_TOOLS_ ${X_TOOLS_COMMON_PATH}/CommonUI/xToolsApplication.cpp)
+list(APPEND X_TOOLS_COMMON ${X_TOOLS_COMMON_PATH}/Common/xToolsSettings.h)
+list(APPEND X_TOOLS_COMMON ${X_TOOLS_COMMON_PATH}/Common/xToolsSettings.cpp)
+list(APPEND X_TOOLS_COMMON ${X_TOOLS_COMMON_PATH}/Common/xToolsApplication.h)
+list(APPEND X_TOOLS_COMMON ${X_TOOLS_COMMON_PATH}/Common/xToolsApplication.cpp)
+list(APPEND X_TOOLS_COMMON ${X_TOOLS_COMMON_PATH}/CommonUI/xToolsMainWindow.h)
+list(APPEND X_TOOLS_COMMON ${X_TOOLS_COMMON_PATH}/CommonUI/xToolsMainWindow.cpp)
 
 macro(x_tools_add_assistant dir_name app_name)
   string(TOUPPER ${app_name} upper_app_name)
@@ -22,7 +20,7 @@ macro(x_tools_add_assistant dir_name app_name)
     list(APPEND ASSISTANT_SOURCES ${ASSISTANT_SOURCES_CPP})
     list(APPEND ASSISTANT_SOURCES ${ASSISTANT_SOURCES_QRC})
     list(APPEND ASSISTANT_SOURCES ${ASSISTANT_OWN_SOURCE})
-    list(APPEND ASSISTANT_SOURCES ${X_TOOLS_})
+    list(APPEND ASSISTANT_SOURCES ${X_TOOLS_COMMON})
     list(APPEND ASSISTANT_SOURCES ${CMAKE_SOURCE_DIR}/xTools.qrc)
     list(APPEND ASSISTANT_SOURCES ${CMAKE_SOURCE_DIR}/Source/Common/xToolsCommon.qrc)
     if(WIN32)
diff --git a/Source/Assistants/CRC/CMakeLists.txt b/Source/Assistants/CRC/CMakeLists.txt
index 2d9e3c47..9529bc18 100644
--- a/Source/Assistants/CRC/CMakeLists.txt
+++ b/Source/Assistants/CRC/CMakeLists.txt
@@ -1,6 +1,4 @@
 set(ASSISTANT_OWN_SOURCE "")
-list(APPEND ASSISTANT_OWN_SOURCE ${CMAKE_SOURCE_DIR}/Source/Common/Common/xToolsCrcInterface.h)
-list(APPEND ASSISTANT_OWN_SOURCE ${CMAKE_SOURCE_DIR}/Source/Common/Common/xToolsCrcInterface.cpp)
 set(ASSISTANT_OWN_LIBS Qt${QT_VERSION_MAJOR}::Widgets)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source)
diff --git a/Source/Assistants/CRC/main.cpp b/Source/Assistants/CRC/main.cpp
index 10cb4a66..aabb5f18 100644
--- a/Source/Assistants/CRC/main.cpp
+++ b/Source/Assistants/CRC/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsCRCAssistant.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Source/Assistants/FileCheck/main.cpp b/Source/Assistants/FileCheck/main.cpp
index 9764e454..8477e061 100644
--- a/Source/Assistants/FileCheck/main.cpp
+++ b/Source/Assistants/FileCheck/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsFileCheckAssistant.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Source/Assistants/Number/main.cpp b/Source/Assistants/Number/main.cpp
index 0e37680d..72b780f5 100644
--- a/Source/Assistants/Number/main.cpp
+++ b/Source/Assistants/Number/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsNumberAssistant.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Source/Assistants/Ping/main.cpp b/Source/Assistants/Ping/main.cpp
index d932e81d..31f302f1 100644
--- a/Source/Assistants/Ping/main.cpp
+++ b/Source/Assistants/Ping/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsPingAssistant.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/Source/Assistants/String/main.cpp b/Source/Assistants/String/main.cpp
index a404e17e..26580a63 100644
--- a/Source/Assistants/String/main.cpp
+++ b/Source/Assistants/String/main.cpp
@@ -7,7 +7,7 @@
  * code directory.
  **************************************************************************************************/
 #include "xToolsStringAssistant.h"
-#include "xToolsUi.h"
+#include "xTools.h"
 
 int main(int argc, char* argv[])
 {
diff --git a/Source/Assistants/mDNS/CMakeLists.txt b/Source/Assistants/mDNS/CMakeLists.txt
index 9f5d487f..1b4a3d35 100644
--- a/Source/Assistants/mDNS/CMakeLists.txt
+++ b/Source/Assistants/mDNS/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(ASSISTANT_OWN_SOURCE "")
+set(ASSISTANT_OWN_SOURCE ${CMAKE_SOURCE_DIR}/Source/Common/Common/xToolsDataStruct.h)
+set(ASSISTANT_OWN_SOURCE ${CMAKE_SOURCE_DIR}/Source/Common/Common/xToolsDataStruct.cpp)
 set(ASSISTANT_OWN_LIBS Qt${QT_VERSION_MAJOR}::Widgets qmdnsengine)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source)
diff --git a/Source/Assistants/mDNS/main.cpp b/Source/Assistants/mDNS/main.cpp
index 93e74721..3592d7a4 100644
--- a/Source/Assistants/mDNS/main.cpp
+++ b/Source/Assistants/mDNS/main.cpp
@@ -6,8 +6,8 @@
  * xTools is licensed according to the terms in the file LICENCE(GPL V3) in the root of the source
  * code directory.
  **************************************************************************************************/
+#include "xTools.h"
 #include "xToolsMdnsAssistant.h"
-#include "xToolsUi.h"
 
 int main(int argc, char* argv[])
 {