disambiguation for the include search path

protocol/esta/acn/dmp/CMakeLists.txt

@@ -7,12 +7,12 @@ target_sources(${PROJECT_NAME}
     PUBLIC
         appliance.h
         component.h
-        controller.h
+        dmp_controller.h
         device.h
         event.h
     PRIVATE
         appliance.cpp
-        controller.cpp
+        dmp_controller.cpp
         device.cpp
         dmp.cpp
         dmp.h

protocol/esta/acn/dmp/dmp_controller.cpp

@@ -22,7 +22,7 @@
   SOFTWARE.
 */
 
-#include "controller.h"
+#include "dmp_controller.h"
 
 namespace ACN::DMP {
 

protocol/esta/rdm/CMakeLists.txt

@@ -7,7 +7,7 @@ configure_file(../../config.h.in config.h)
 
 target_sources(${PROJECT_NAME}
     PUBLIC
-        controller.h
+        rdm_controller.h
         device.h
         message.h
         parameter.h
@@ -15,7 +15,7 @@ target_sources(${PROJECT_NAME}
         sensor.h
         status.h
     PRIVATE
-        controller.cpp
+        rdm_controller.cpp
         device.cpp
         E1.37-1.h
         E1.37-2.h

protocol/esta/rdm/rdm_controller.cpp

@@ -22,7 +22,7 @@
   SOFTWARE.
 */
 
-#include "controller.h"
+#include "rdm_controller.h"
 
 namespace RDM {
 

protocol/esta/rdm/rdm_controller.h

@@ -23,9 +23,9 @@
 */
 #pragma once
 
-#include "message.h"
-
 #include <cstdint>
+#include "message.h"
+#include "uid.h"
 
 namespace RDM {
 
@@ -53,6 +53,3 @@ private:
 };
 
 } // namespace RDM
-
-
-

protocol/esta/rdmnet/controller.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "implementation.h"
-#include "../rdm/controller.h"
+#include "rdm_controller.h"
 #include "rpt/controller.h"
 
 namespace RDMnet {