diff --git a/grpc/server/src/CMakeLists.txt b/grpc/server/src/CMakeLists.txt
index 86c7c26bf4..d289591413 100644
--- a/grpc/server/src/CMakeLists.txt
+++ b/grpc/server/src/CMakeLists.txt
@@ -45,9 +45,7 @@ target_link_libraries(backend
 target_include_directories(backend
     PRIVATE
     ${CMAKE_SOURCE_DIR}/core
-    ${CMAKE_SOURCE_DIR}/plugins/action
-    ${CMAKE_SOURCE_DIR}/plugins/mission
-    ${CMAKE_SOURCE_DIR}/plugins/telemetry
+    ${CMAKE_SOURCE_DIR}/plugins
     ${CMAKE_BINARY_DIR}/grpc/server/src
     ${PLUGINS_DIR}
 )
diff --git a/grpc/server/src/plugins/action/action_service_impl.h b/grpc/server/src/plugins/action/action_service_impl.h
index 3d1345e209..a9886f2996 100644
--- a/grpc/server/src/plugins/action/action_service_impl.h
+++ b/grpc/server/src/plugins/action/action_service_impl.h
@@ -1,4 +1,4 @@
-#include "action.h"
+#include "action/action.h"
 #include "action/action.grpc.pb.h"
 
 class ActionServiceImpl final : public dronecore::rpc::action::ActionService::Service
diff --git a/grpc/server/src/plugins/mission/missionrpc_impl.h b/grpc/server/src/plugins/mission/missionrpc_impl.h
index cb0ffa4409..ff8eaac570 100644
--- a/grpc/server/src/plugins/mission/missionrpc_impl.h
+++ b/grpc/server/src/plugins/mission/missionrpc_impl.h
@@ -1,6 +1,6 @@
 #include <future>
 
-#include "mission.h"
+#include "mission/mission.h"
 #include "mission/mission.grpc.pb.h"
 
 using grpc::Status;
diff --git a/grpc/server/src/plugins/telemetry/telemetryrpc_impl.h b/grpc/server/src/plugins/telemetry/telemetryrpc_impl.h
index dacb0b00e2..323e91a5ac 100644
--- a/grpc/server/src/plugins/telemetry/telemetryrpc_impl.h
+++ b/grpc/server/src/plugins/telemetry/telemetryrpc_impl.h
@@ -1,4 +1,4 @@
-#include "telemetry.h"
+#include "telemetry/telemetry.h"
 #include "telemetry/telemetry.grpc.pb.h"
 
 using grpc::Status;
diff --git a/grpc/server/test/CMakeLists.txt b/grpc/server/test/CMakeLists.txt
index 5ccb79f917..7a8083a6a6 100644
--- a/grpc/server/test/CMakeLists.txt
+++ b/grpc/server/test/CMakeLists.txt
@@ -9,6 +9,9 @@ set_target_properties(unit_tests_backend PROPERTIES COMPILE_FLAGS ${warnings})
 target_include_directories(unit_tests_backend
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/plugins
+    ${CMAKE_SOURCE_DIR}/plugins
+    ${CMAKE_BINARY_DIR}/grpc/server/src
 )
 
 target_link_libraries(unit_tests_backend
diff --git a/grpc/server/test/connection_initiator_test.cpp b/grpc/server/test/connection_initiator_test.cpp
index 7bd1983550..2125d5e328 100644
--- a/grpc/server/test/connection_initiator_test.cpp
+++ b/grpc/server/test/connection_initiator_test.cpp
@@ -1,5 +1,5 @@
 #include <future>
-#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include "connection_initiator.h"
 #include "mocks/dronecore_mock.h"