diff --git a/include/alpaka/dev/DevUniformCudaHipRt.hpp b/include/alpaka/dev/DevUniformCudaHipRt.hpp
index 9954a969c75..44e6961692c 100644
--- a/include/alpaka/dev/DevUniformCudaHipRt.hpp
+++ b/include/alpaka/dev/DevUniformCudaHipRt.hpp
@@ -15,7 +15,6 @@
 #include "alpaka/platform/Traits.hpp"
 #include "alpaka/queue/Properties.hpp"
 #include "alpaka/queue/Traits.hpp"
-#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp"
 #include "alpaka/traits/Traits.hpp"
 #include "alpaka/wait/Traits.hpp"
 
@@ -23,6 +22,8 @@
 #include <string>
 #include <vector>
 
+#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp"
+
 #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED)
 
 namespace alpaka
diff --git a/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp b/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp
index 53bbaf67529..091f8de1c8e 100644
--- a/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp
+++ b/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp
@@ -21,13 +21,14 @@
 #include "alpaka/kernel/Traits.hpp"
 #include "alpaka/platform/Traits.hpp"
 #include "alpaka/queue/Traits.hpp"
-#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp"
 #include "alpaka/workdiv/WorkDivHelpers.hpp"
 #include "alpaka/workdiv/WorkDivMembers.hpp"
 
 #include <stdexcept>
 #include <tuple>
 #include <type_traits>
+
+#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp"
 #if ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL
 #    include <iostream>
 #endif
diff --git a/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp b/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp
index 137670abe7a..2dde758dc6f 100644
--- a/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp
+++ b/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp
@@ -7,7 +7,8 @@
 #include "alpaka/dev/DevUniformCudaHipRt.hpp"
 #include "alpaka/mem/global/Traits.hpp"
 #include "alpaka/mem/view/ViewPlainPtr.hpp"
-#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp"
+
+#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp"
 
 #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED)
 
diff --git a/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp b/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp
index 5add0ef21ae..93ea56f8dae 100644
--- a/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp
+++ b/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp"
+#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp"
 
 #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED)
 
diff --git a/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp b/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp
index 62b0b0f0884..8172f334273 100644
--- a/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp
+++ b/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp"
+#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp"
 
 #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED)
 
diff --git a/include/alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp b/include/alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp
similarity index 100%
rename from include/alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp
rename to include/alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp