diff --git a/Geometry/CommonTopologies/interface/SimplePixelTopology.h b/Geometry/CommonTopologies/interface/SimplePixelTopology.h
index 304e8a1255cce..d0e9082122a24 100644
--- a/Geometry/CommonTopologies/interface/SimplePixelTopology.h
+++ b/Geometry/CommonTopologies/interface/SimplePixelTopology.h
@@ -290,6 +290,7 @@ namespace pixelTopology {
     using tindex_type = uint32_t;  // for tuples
     using cindex_type = uint32_t;  // for cells
 
+    static constexpr uint32_t maxNumberOfHits = 256 * 1024;
     static constexpr uint32_t maxCellNeighbors = 64;
     static constexpr uint32_t maxCellTracks = 302;
     static constexpr uint32_t maxHitsOnTrack = 15;
@@ -382,6 +383,7 @@ namespace pixelTopology {
     using tindex_type = uint16_t;  // for tuples
     using cindex_type = uint32_t;  // for cells
 
+    static constexpr uint32_t maxNumberOfHits = 48 * 1024;
     static constexpr uint32_t maxCellNeighbors = 36;
     static constexpr uint32_t maxCellTracks = 48;
     static constexpr uint32_t maxHitsOnTrack = 10;
diff --git a/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackProducerFromSoA.cc b/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackProducerFromSoA.cc
index f5f006454125b..d575f9ab9bf9d 100644
--- a/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackProducerFromSoA.cc
+++ b/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackProducerFromSoA.cc
@@ -31,7 +31,6 @@
 #include "Geometry/CommonTopologies/interface/SimplePixelTopology.h"
 
 #include "storeTracks.h"
-#include "CUDADataFormats/Common/interface/HostProduct.h"
 
 #include "CUDADataFormats/Track/interface/TrackSoAHeterogeneousHost.h"
 #include "CUDADataFormats/Track/interface/TrackSoAHeterogeneousDevice.h"
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/CAStructures.h b/RecoPixelVertexing/PixelTriplets/plugins/CAStructures.h
index 21f9d474c683c..d5dfadd69cba5 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/CAStructures.h
+++ b/RecoPixelVertexing/PixelTriplets/plugins/CAStructures.h
@@ -1,5 +1,5 @@
-#ifndef CUDADataFormats_TrackerGeometry_CAStructures_h
-#define CUDADataFormats_TrackerGeometry_CAStructures_h
+#ifndef RecoPixelVertexing_PixelTriplets_CAStructures_h
+#define RecoPixelVertexing_PixelTriplets_CAStructures_h
 
 #include "HeterogeneousCore/CUDAUtilities/interface/SimpleVector.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/VecArray.h"