diff --git a/include/picongpu/param/precision.param b/include/picongpu/param/precision.param
index 3af667bb054..a15779b99e7 100644
--- a/include/picongpu/param/precision.param
+++ b/include/picongpu/param/precision.param
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include <picongpu/simulation_types.hpp>
 
 namespace picongpu
 {
diff --git a/include/picongpu/particles/Particles.hpp b/include/picongpu/particles/Particles.hpp
index f0d0595d4d1..a7af9f58670 100644
--- a/include/picongpu/particles/Particles.hpp
+++ b/include/picongpu/particles/Particles.hpp
@@ -249,14 +249,6 @@ namespace picongpu
         }
     };
 
-    namespace traits
-    {
-        template<typename T_Name, typename T_Attributes, typename T_Flags>
-        struct GetDataBoxType<picongpu::Particles<T_Name, T_Attributes, T_Flags>>
-        {
-            using type = typename picongpu::Particles<T_Name, T_Attributes, T_Flags>::ParticlesBoxType;
-        };
-    } // namespace traits
 } // namespace picongpu
 
 namespace pmacc
diff --git a/include/picongpu/particles/shapes/CIC.hpp b/include/picongpu/particles/shapes/CIC.hpp
index 02b4763fa5f..84b39d07be0 100644
--- a/include/picongpu/particles/shapes/CIC.hpp
+++ b/include/picongpu/particles/shapes/CIC.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 
diff --git a/include/picongpu/particles/shapes/Counter.hpp b/include/picongpu/particles/shapes/Counter.hpp
index 21c162eb3cc..68189b496d6 100644
--- a/include/picongpu/particles/shapes/Counter.hpp
+++ b/include/picongpu/particles/shapes/Counter.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 
diff --git a/include/picongpu/particles/shapes/NGP.hpp b/include/picongpu/particles/shapes/NGP.hpp
index 113f973d8c9..844852d1d8f 100644
--- a/include/picongpu/particles/shapes/NGP.hpp
+++ b/include/picongpu/particles/shapes/NGP.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 
diff --git a/include/picongpu/particles/shapes/PCS.hpp b/include/picongpu/particles/shapes/PCS.hpp
index 31241d0ca7f..9edee863142 100644
--- a/include/picongpu/particles/shapes/PCS.hpp
+++ b/include/picongpu/particles/shapes/PCS.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 
diff --git a/include/picongpu/particles/shapes/PQS.hpp b/include/picongpu/particles/shapes/PQS.hpp
index b9e8fbc9a2c..f3f7f2aeac2 100644
--- a/include/picongpu/particles/shapes/PQS.hpp
+++ b/include/picongpu/particles/shapes/PQS.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 
diff --git a/include/picongpu/particles/shapes/TSC.hpp b/include/picongpu/particles/shapes/TSC.hpp
index 694db22fb91..4a8802374ae 100644
--- a/include/picongpu/particles/shapes/TSC.hpp
+++ b/include/picongpu/particles/shapes/TSC.hpp
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 
diff --git a/include/picongpu/simulation_defines.hpp b/include/picongpu/simulation_defines.hpp
index e04b3a4583a..1da42bf119b 100644
--- a/include/picongpu/simulation_defines.hpp
+++ b/include/picongpu/simulation_defines.hpp
@@ -26,11 +26,13 @@
 #include <pmacc/types.hpp>
 #include <picongpu/simulation_types.hpp>
 #include "pmacc_renamings.hpp"
+#include "picongpu/traits/GetMargin.hpp"
 
 
 namespace picongpu
 {
     using namespace pmacc;
+    using namespace picongpu::traits;
 }
 
 /* IMPORTANT we need to use #include <...> for local files
diff --git a/include/picongpu/simulation_types.hpp b/include/picongpu/simulation_types.hpp
index 6cd2a3796aa..e56d1f8b8d6 100644
--- a/include/picongpu/simulation_types.hpp
+++ b/include/picongpu/simulation_types.hpp
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "picongpu/traits/GetDataBoxType.hpp"
-#include "picongpu/traits/GetMargin.hpp"
 #include "version.hpp"
 
 #include <pmacc/algorithms/PromoteType.hpp>
@@ -56,6 +54,5 @@ namespace picongpu
 
     using namespace pmacc::algorithms::promoteType;
     using namespace pmacc::traits;
-    using namespace picongpu::traits;
 
 } // namespace picongpu
diff --git a/include/picongpu/traits/GetDataBoxType.hpp b/include/picongpu/traits/GetDataBoxType.hpp
deleted file mode 100644
index 73108cd2da4..00000000000
--- a/include/picongpu/traits/GetDataBoxType.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2015-2023 Rene Widera
- *
- * This file is part of PIConGPU.
- *
- * PIConGPU is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PIConGPU is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with PIConGPU.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-namespace picongpu
-{
-    namespace traits
-    {
-        /** Get data box type of a buffer
-         *
-         * @tparam T_Type type from which you need the DataBoxType
-         * @treturn ::type
-         */
-        template<typename T_Type>
-        struct GetDataBoxType;
-
-    } // namespace traits
-} // namespace picongpu
diff --git a/include/picongpu/unitless/precision.unitless b/include/picongpu/unitless/precision.unitless
index c947cd9d0b0..09d4bc373ec 100644
--- a/include/picongpu/unitless/precision.unitless
+++ b/include/picongpu/unitless/precision.unitless
@@ -19,8 +19,9 @@
 
 #pragma once
 
-#include <pmacc/math/Vector.hpp>
+#include "picongpu/param/dimension.param"
 
+#include <pmacc/math/Vector.hpp>
 
 namespace picongpu
 {