IVGCVSW-4731 Move Packet.hpp to profiling/common/include

 * Refactor profiling cmake to fix inconsistencies/issues with includes

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I0836762d4c72e25754a28162ec54c8e332422a02

30 files changed, 91 insertions, 62 deletions

diff --git a/Android.mk b/Android.mk
index 99b169471e..c9254c7f31 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,7 @@ OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include
 NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
 ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
 ARMNN_PROFILING_INCLUDE_PATH := $(LOCAL_PATH)/profiling
+ARMNN_PROFILING_COMMON_INCLUDE_PATH := $(LOCAL_PATH)/profiling/common/include
 ARMNN_TIMELINE_DECODER_INCLUDE_PATH := $(LOCAL_PATH)/src/timelineDecoder
 ARMNN_MAIN_HEADER_PATH := $(LOCAL_PATH)/src
 ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn
@@ -67,6 +68,7 @@ LOCAL_EXPORT_C_INCLUDES := \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
         $(ARMNN_PROFILING_HEADER_PATH) \
@@ -77,6 +79,7 @@ LOCAL_C_INCLUDES := \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
@@ -305,6 +308,7 @@ LOCAL_C_INCLUDES := \
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eefa5e70bb..5f78a664f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,6 +250,7 @@ list(APPEND armnn_sources
     include/armnn/utility/NumericCast.hpp
     include/armnn/utility/PolymorphicDowncast.hpp
     include/armnn/utility/StringUtils.hpp
+    profiling/common/include/Packet.hpp
     profiling/common/include/ProfilingException.hpp
     profiling/common/include/SocketConnectionException.hpp
     profiling/common/include/Constants.hpp
@@ -507,7 +508,6 @@ list(APPEND armnn_sources
     src/profiling/LabelsAndEventClasses.cpp
     src/profiling/LabelsAndEventClasses.hpp
     src/profiling/NullProfilingConnection.hpp
-    src/profiling/Packet.hpp
     src/profiling/PacketBuffer.cpp
     src/profiling/PacketBuffer.hpp
     src/profiling/PacketVersionResolver.cpp
@@ -921,7 +921,6 @@ if(BUILD_UNIT_TESTS)
     target_include_directories(UnitTests PRIVATE src/armnnUtils)
     target_include_directories(UnitTests PRIVATE src/backends)
     target_include_directories(UnitTests PRIVATE src/profiling)
-    target_include_directories(UnitTests PRIVATE src/timelineDecoder)
 
     if(VALGRIND_FOUND)
         if(HEAP_PROFILING OR LEAK_CHECKING)
@@ -1052,21 +1051,33 @@ if(BUILD_GATORD_MOCK)
         tests/profiling/gatordmock/StubCommandHandler.hpp
         )
 
-    include_directories(src/profiling src/timelineDecoder profiling/server/src/basePipeServer tests/profiling)
-
     add_library_ex(gatordMockService STATIC ${gatord_mock_sources})
-    target_include_directories(gatordMockService PRIVATE src/armnnUtils)
+
+    target_include_directories(gatordMockService PRIVATE profiling/common/include
+                                                         profiling/server/src/basePipeServer
+                                                         src/armnnUtils
+                                                         src/profiling
+                                                         src/timelineDecoder)
+
+    if(BUILD_UNIT_TESTS)
+        target_include_directories(UnitTests PRIVATE tests/profiling/gatordmock)
+        target_include_directories(UnitTests PRIVATE src/backends/backendsCommon/test)
+    endif()
 
     add_executable_ex(GatordMock tests/profiling/gatordmock/GatordMockMain.cpp)
-    target_include_directories(GatordMock PRIVATE src/armnnUtils)
+
+    target_include_directories(GatordMock PRIVATE profiling/common/include
+                                                  profiling/server/src/basePipeServer
+                                                  src/profiling
+                                                  src/timelineDecoder)
 
     target_link_libraries(GatordMock
-        armnn
-        armnnBasePipeServer
-        timelineDecoder
-        gatordMockService
-        ${Boost_PROGRAM_OPTIONS_LIBRARY}
-        ${Boost_SYSTEM_LIBRARY})
+                          armnn
+                          armnnBasePipeServer
+                          timelineDecoder
+                          gatordMockService
+                          ${Boost_PROGRAM_OPTIONS_LIBRARY}
+                          ${Boost_SYSTEM_LIBRARY})
 
     if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
         target_link_libraries(GatordMock pthread)
diff --git a/src/profiling/Packet.hpp b/profiling/common/include/Packet.hpp
index c1f2796804..c1f2796804 100644
--- a/src/profiling/Packet.hpp
+++ b/profiling/common/include/Packet.hpp
diff --git a/profiling/server/src/basePipeServer/BasePipeServer.hpp b/profiling/server/src/basePipeServer/BasePipeServer.hpp
index 4e6e0c0e4b..bef9d29f44 100644
--- a/profiling/server/src/basePipeServer/BasePipeServer.hpp
+++ b/profiling/server/src/basePipeServer/BasePipeServer.hpp
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include "common/include/NetworkSockets.hpp"
-#include "../../../../src/profiling/Packet.hpp"
-#include "common/include/SocketConnectionException.hpp"
+#include <NetworkSockets.hpp>
+#include <Packet.hpp>
+#include <SocketConnectionException.hpp>
 
 #include <string>
 #include <atomic>
diff --git a/profiling/server/src/basePipeServer/CMakeLists.txt b/profiling/server/src/basePipeServer/CMakeLists.txt
index e535cf2e66..b2cb82d816 100644
--- a/profiling/server/src/basePipeServer/CMakeLists.txt
+++ b/profiling/server/src/basePipeServer/CMakeLists.txt
@@ -6,15 +6,20 @@
 if(BUILD_BASE_PIPE_SERVER)
     set(BasePipeServer_sources)
     list(APPEND BasePipeServer_sources
-            BasePipeServer.cpp
-            BasePipeServer.hpp
-            ConnectionHandler.cpp
-            ConnectionHandler.hpp
-            )
+        BasePipeServer.cpp
+        BasePipeServer.hpp
+        ConnectionHandler.cpp
+        ConnectionHandler.hpp)
 
-    include_directories(src/armnnUtils src/profiling)
+    include_directories(${PROJECT_SOURCE_DIR}/profiling/common/include)
+
+    if (BUILD_UNIT_TESTS)
+        target_include_directories(UnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/server/src/basePipeServer)
+        target_include_directories(UnitTests PUBLIC ${PROJECT_SOURCE_DIR}/profiling/common/include)
+    endif()
 
     add_library_ex(armnnBasePipeServer SHARED ${BasePipeServer_sources})
+
     set_target_properties(armnnBasePipeServer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
     set_target_properties(armnnBasePipeServer PROPERTIES VERSION ${GENERIC_LIB_VERSION}
                           SOVERSION ${GENERIC_LIB_SOVERSION})
diff --git a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
index c85bbe72d3..c97fecd94d 100644
--- a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
+++ b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "../ConnectionHandler.hpp"
+#include <ConnectionHandler.hpp>
 
 #include <SocketProfilingConnection.hpp>
 #include <Processes.hpp>
diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.hpp b/src/profiling/ActivateTimelineReportingCommandHandler.hpp
index ac11b46379..a0a2de0888 100644
--- a/src/profiling/ActivateTimelineReportingCommandHandler.hpp
+++ b/src/profiling/ActivateTimelineReportingCommandHandler.hpp
@@ -7,12 +7,15 @@
 
 #include "CommandHandlerFunctor.hpp"
 #include "ProfilingStateMachine.hpp"
-#include "Packet.hpp"
 #include "SendTimelinePacket.hpp"
 #include "IReportStructure.hpp"
-#include "armnn/Optional.hpp"
 #include "INotifyBackends.hpp"
 
+#include "armnn/Optional.hpp"
+
+#include "common/include/Packet.hpp"
+
+
 namespace armnn
 {
 
diff --git a/src/profiling/CommandHandlerFunctor.hpp b/src/profiling/CommandHandlerFunctor.hpp
index 743bb937c2..8096c41a3c 100644
--- a/src/profiling/CommandHandlerFunctor.hpp
+++ b/src/profiling/CommandHandlerFunctor.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 
 #include <armnn/utility/IgnoreUnused.hpp>
 
diff --git a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp b/src/profiling/ConnectionAcknowledgedCommandHandler.hpp
index 053d3c32fc..bcd1eed9cb 100644
--- a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp
+++ b/src/profiling/ConnectionAcknowledgedCommandHandler.hpp
@@ -9,9 +9,8 @@
 #include "CommandHandlerFunctor.hpp"
 #include "ISendCounterPacket.hpp"
 #include "armnn/profiling/ISendTimelinePacket.hpp"
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include "ProfilingStateMachine.hpp"
-#include <future>
 
 namespace armnn
 {
diff --git a/src/profiling/DeactivateTimelineReportingCommandHandler.hpp b/src/profiling/DeactivateTimelineReportingCommandHandler.hpp
index e06bae836f..e9ce63db14 100644
--- a/src/profiling/DeactivateTimelineReportingCommandHandler.hpp
+++ b/src/profiling/DeactivateTimelineReportingCommandHandler.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "CommandHandlerFunctor.hpp"
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include "ProfilingStateMachine.hpp"
 #include "INotifyBackends.hpp"
 
diff --git a/src/profiling/FileOnlyProfilingConnection.hpp b/src/profiling/FileOnlyProfilingConnection.hpp
index 466f4f1831..75db477b4f 100644
--- a/src/profiling/FileOnlyProfilingConnection.hpp
+++ b/src/profiling/FileOnlyProfilingConnection.hpp
@@ -8,7 +8,7 @@
 #include <armnn/profiling/ILocalPacketHandler.hpp>
 #include "DirectoryCaptureCommandHandler.hpp"
 #include "IProfilingConnection.hpp"
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include "ProfilingUtils.hpp"
 #include "Runtime.hpp"
 
diff --git a/src/profiling/IProfilingConnection.hpp b/src/profiling/IProfilingConnection.hpp
index 2a1c35f57e..2fc950e4e6 100644
--- a/src/profiling/IProfilingConnection.hpp
+++ b/src/profiling/IProfilingConnection.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include <armnn/profiling/ILocalPacketHandler.hpp>
 
 #include <cstdint>
diff --git a/src/profiling/PerJobCounterSelectionCommandHandler.hpp b/src/profiling/PerJobCounterSelectionCommandHandler.hpp
index 738a4762f9..16cb02a285 100644
--- a/src/profiling/PerJobCounterSelectionCommandHandler.hpp
+++ b/src/profiling/PerJobCounterSelectionCommandHandler.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include "CommandHandlerFunctor.hpp"
 #include "ProfilingStateMachine.hpp"
 
diff --git a/src/profiling/PeriodicCounterCapture.hpp b/src/profiling/PeriodicCounterCapture.hpp
index 51ac273860..796c494480 100644
--- a/src/profiling/PeriodicCounterCapture.hpp
+++ b/src/profiling/PeriodicCounterCapture.hpp
@@ -7,7 +7,7 @@
 
 #include "IPeriodicCounterCapture.hpp"
 #include "Holder.hpp"
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include "SendCounterPacket.hpp"
 #include "ICounterValues.hpp"
 #include "CounterIdMap.hpp"
diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp
index b59d84cffa..8cf5595920 100644
--- a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp
+++ b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "CounterIdMap.hpp"
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include "CommandHandlerFunctor.hpp"
 #include "Holder.hpp"
 #include "ProfilingStateMachine.hpp"
diff --git a/src/profiling/ProfilingUtils.hpp b/src/profiling/ProfilingUtils.hpp
index e2ffb24bf9..127534a593 100644
--- a/src/profiling/ProfilingUtils.hpp
+++ b/src/profiling/ProfilingUtils.hpp
@@ -10,7 +10,8 @@
 
 #include "ICounterDirectory.hpp"
 #include "IPacketBuffer.hpp"
-#include "Packet.hpp"
+
+#include "common/include/Packet.hpp"
 
 #include <boost/numeric/conversion/cast.hpp>
 
diff --git a/src/profiling/RequestCounterDirectoryCommandHandler.hpp b/src/profiling/RequestCounterDirectoryCommandHandler.hpp
index 9ceca3f643..ea60ca83e4 100644
--- a/src/profiling/RequestCounterDirectoryCommandHandler.hpp
+++ b/src/profiling/RequestCounterDirectoryCommandHandler.hpp
@@ -8,7 +8,7 @@
 #include "CommandHandlerFunctor.hpp"
 #include "ISendCounterPacket.hpp"
 #include "armnn/profiling/ISendTimelinePacket.hpp"
-#include "Packet.hpp"
+#include "common/include/Packet.hpp"
 #include "ProfilingStateMachine.hpp"
 
 namespace armnn
diff --git a/src/profiling/test/PrintPacketHeaderHandler.hpp b/src/profiling/test/PrintPacketHeaderHandler.hpp
index 3cd5921e51..6564f3cea5 100644
--- a/src/profiling/test/PrintPacketHeaderHandler.hpp
+++ b/src/profiling/test/PrintPacketHeaderHandler.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <armnn/profiling/ILocalPacketHandler.hpp>
-#include "Packet.hpp"
+#include <Packet.hpp>
 
 namespace armnn
 {
diff --git a/src/profiling/test/TestTimelinePacketHandler.hpp b/src/profiling/test/TestTimelinePacketHandler.hpp
index 2902e5f89c..67395254fc 100644
--- a/src/profiling/test/TestTimelinePacketHandler.hpp
+++ b/src/profiling/test/TestTimelinePacketHandler.hpp
@@ -7,7 +7,8 @@
 
 #include <armnn/profiling/ILocalPacketHandler.hpp>
 #include <armnn/profiling/ITimelineDecoder.hpp>
-#include "Packet.hpp"
+#include <Packet.hpp>
+
 #include "ProfilingUtils.hpp"
 #include "TimelineCaptureCommandHandler.hpp"
 #include "TimelineDirectoryCaptureCommandHandler.hpp"
diff --git a/src/timelineDecoder/CMakeLists.txt b/src/timelineDecoder/CMakeLists.txt
index 12fe2a0f04..f844325b1d 100644
--- a/src/timelineDecoder/CMakeLists.txt
+++ b/src/timelineDecoder/CMakeLists.txt
@@ -6,20 +6,25 @@
 if(BUILD_TIMELINE_DECODER)
     set(timelineDecoder_sources)
     list(APPEND timelineDecoder_sources
-            ../../include/armnn/profiling/ITimelineDecoder.hpp
-            TimelineCaptureCommandHandler.cpp
-            TimelineCaptureCommandHandler.hpp
-            JSONTimelineDecoder.cpp
-            JSONTimelineDecoder.hpp
-            TimelineDecoder.cpp
-            TimelineDecoder.hpp
-            TimelineDirectoryCaptureCommandHandler.cpp
-            TimelineDirectoryCaptureCommandHandler.hpp
-            )
-
-    include_directories(../timelineDecoder ../profiling)
+        ${PROJECT_SOURCE_DIR}/include/armnn/profiling/ITimelineDecoder.hpp
+        TimelineCaptureCommandHandler.cpp
+        TimelineCaptureCommandHandler.hpp
+        JSONTimelineDecoder.cpp
+        JSONTimelineDecoder.hpp
+        TimelineDecoder.cpp
+        TimelineDecoder.hpp
+        TimelineDirectoryCaptureCommandHandler.cpp
+        TimelineDirectoryCaptureCommandHandler.hpp)
+
+    include_directories(${PROJECT_SOURCE_DIR}/src/profiling
+                        ${PROJECT_SOURCE_DIR}/profiling/common/include)
+
+    if(BUILD_UNIT_TESTS)
+      target_include_directories(UnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/timelineDecoder)
+    endif()
 
     add_library_ex(timelineDecoder SHARED ${timelineDecoder_sources})
+
     set_target_properties(timelineDecoder PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
     set_target_properties(timelineDecoder PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
diff --git a/src/timelineDecoder/JSONTimelineDecoder.hpp b/src/timelineDecoder/JSONTimelineDecoder.hpp
index c4e085587e..38d698387a 100644
--- a/src/timelineDecoder/JSONTimelineDecoder.hpp
+++ b/src/timelineDecoder/JSONTimelineDecoder.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "armnn/profiling/ITimelineDecoder.hpp"
+#include <armnn/profiling/ITimelineDecoder.hpp>
 
 #include <map>
 #include <vector>
diff --git a/src/timelineDecoder/TimelineCaptureCommandHandler.hpp b/src/timelineDecoder/TimelineCaptureCommandHandler.hpp
index e143b5f6e5..6c0c57ae69 100644
--- a/src/timelineDecoder/TimelineCaptureCommandHandler.hpp
+++ b/src/timelineDecoder/TimelineCaptureCommandHandler.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "armnn/profiling/ITimelineDecoder.hpp"
+#include <armnn/profiling/ITimelineDecoder.hpp>
 
 #include <CommandHandlerFunctor.hpp>
 #include <Packet.hpp>
diff --git a/src/timelineDecoder/TimelineDecoder.hpp b/src/timelineDecoder/TimelineDecoder.hpp
index c6d1e4ee0a..2efdc4483b 100644
--- a/src/timelineDecoder/TimelineDecoder.hpp
+++ b/src/timelineDecoder/TimelineDecoder.hpp
@@ -4,7 +4,8 @@
 //
 #pragma once
 
-#include "armnn/profiling/ITimelineDecoder.hpp"
+#include <armnn/profiling/ITimelineDecoder.hpp>
+
 #include <vector>
 
 namespace armnn
diff --git a/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp b/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp
index a22a5d9f87..2879052340 100644
--- a/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp
+++ b/src/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
+#include "TimelineCaptureCommandHandler.hpp"
 
-#include <TimelineCaptureCommandHandler.hpp>
 #include <Packet.hpp>
 #include <PacketBuffer.hpp>
 #include <ProfilingUtils.hpp>
diff --git a/tests/profiling/gatordmock/CounterDirectory.hpp b/tests/profiling/gatordmock/CounterDirectory.hpp
index 528c037cbf..31718dd817 100644
--- a/tests/profiling/gatordmock/CounterDirectory.hpp
+++ b/tests/profiling/gatordmock/CounterDirectory.hpp
@@ -9,7 +9,7 @@
 #include "GatordMockService.hpp"
 #include "MockUtils.hpp"
 
-#include "Packet.hpp"
+#include <Packet.hpp>
 #include "CommandHandlerFunctor.hpp"
 #include "SendCounterPacket.hpp"
 #include "IPeriodicCounterCapture.hpp"
diff --git a/tests/profiling/gatordmock/GatordMockMain.cpp b/tests/profiling/gatordmock/GatordMockMain.cpp
index 0dbddeb048..5d6e8869f6 100644
--- a/tests/profiling/gatordmock/GatordMockMain.cpp
+++ b/tests/profiling/gatordmock/GatordMockMain.cpp
@@ -5,9 +5,10 @@
 
 #include "CommandFileParser.hpp"
 #include "CommandLineProcessor.hpp"
-#include <ConnectionHandler.hpp>
 #include "GatordMockService.hpp"
 
+#include <ConnectionHandler.hpp>
+
 #include <string>
 #include <signal.h>
 
diff --git a/tests/profiling/gatordmock/GatordMockService.cpp b/tests/profiling/gatordmock/GatordMockService.cpp
index 53974fec3f..13f688225b 100644
--- a/tests/profiling/gatordmock/GatordMockService.cpp
+++ b/tests/profiling/gatordmock/GatordMockService.cpp
@@ -8,7 +8,7 @@
 #include <CommandHandlerRegistry.hpp>
 #include <PacketVersionResolver.hpp>
 #include <ProfilingUtils.hpp>
-#include <common/include/NetworkSockets.hpp>
+#include <NetworkSockets.hpp>
 
 #include <armnn/utility/Assert.hpp>
 
diff --git a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp
index 645b0b3507..2c2e71170a 100644
--- a/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp
+++ b/tests/profiling/gatordmock/PeriodicCounterSelectionResponseHandler.cpp
@@ -5,7 +5,7 @@
 
 #include "PeriodicCounterSelectionResponseHandler.hpp"
 
-#include "../../../src/profiling/ProfilingUtils.hpp"
+#include <ProfilingUtils.hpp>
 
 #include <iostream>
 
diff --git a/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp b/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp
index 09255a57a1..d97925cc15 100644
--- a/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp
+++ b/tests/profiling/gatordmock/StreamMetadataCommandHandler.cpp
@@ -7,9 +7,6 @@
 
 #include <ProfilingUtils.hpp>
 
-#include <boost/cast.hpp>
-
-#include <sstream>
 #include <iostream>
 
 using namespace armnn::profiling;
diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp
index cdedeeb897..98ca8ffe90 100644
--- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp
+++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp
@@ -6,7 +6,7 @@
 #include <CommandHandlerRegistry.hpp>
 #include <ConnectionHandler.hpp>
 #include <DirectoryCaptureCommandHandler.hpp>
-#include <gatordmock/GatordMockService.hpp>
+#include <GatordMockService.hpp>
 #include <LabelsAndEventClasses.hpp>
 #include <ProfilingService.hpp>
 #include <TimelinePacketWriterFactory.hpp>
@@ -15,7 +15,8 @@
 #include <TimelineDecoder.hpp>
 
 #include <Runtime.hpp>
-#include "../../src/backends/backendsCommon/test/MockBackend.hpp"
+
+#include <MockBackend.hpp>
 
 #include <boost/cast.hpp>
 #include <boost/test/test_tools.hpp>