Index: lib/Comms/CMakeLists.txt
===================================================================
diff -u -r59b4c22f45a1d098064a886452769204e90cfb4b -r51e99f2578e0901d9da91a4cb60d1b8858cfe971
--- lib/Comms/CMakeLists.txt	(.../CMakeLists.txt)	(revision 59b4c22f45a1d098064a886452769204e90cfb4b)
+++ lib/Comms/CMakeLists.txt	(.../CMakeLists.txt)	(revision 51e99f2578e0901d9da91a4cb60d1b8858cfe971)
@@ -6,7 +6,7 @@
 set(CMAKE_AUTOMOC ON)
 
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network SerialBus)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Mqtt Network SerialBus)
 
 set(INCLUDES
     include/CanInterface.h
@@ -20,10 +20,7 @@
     include/main.h
     include/MessageBuilder.h
     include/MessageDispatcher.h
-    include/MqttMessage.h
-    include/MqttPublisher.h
-    include/MqttTcpTransport.h
-    include/MqttTransport.h
+    include/MqttClient.h
     include/types.h
 )
 
@@ -37,9 +34,7 @@
     src/FrameInterface.cpp
     src/MessageBuilder.cpp
     src/MessageDispatcher.cpp
-    src/MqttMessage.cpp
-    src/MqttPublisher.cpp
-    src/MqttTcpTransport.cpp
+    src/MqttClient.cpp
     src/types.cpp
 )
 
@@ -59,6 +54,7 @@
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
     Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Mqtt
     Qt${QT_VERSION_MAJOR}::Network
     Qt${QT_VERSION_MAJOR}::SerialBus
 )