diff --git a/RTCP/InputProc/src/BufferSettings.h b/RTCP/InputProc/src/BufferSettings.h
index 0629def6fb6e1274ff6ff08b90a982b4a2b0269a..37225f986dd025aef7818ff00a2e5dd1428e29e5 100644
--- a/RTCP/InputProc/src/BufferSettings.h
+++ b/RTCP/InputProc/src/BufferSettings.h
@@ -9,8 +9,6 @@
 namespace LOFAR {
 namespace RTCP {
 
-#define NR_RSPBOARDS 4
-
 struct BufferSettings {
 private:
   static const unsigned currentVersion = 1;
diff --git a/RTCP/InputProc/src/SampleBuffer.h b/RTCP/InputProc/src/SampleBuffer.h
index 0d6a21bc710ae2a8bd7bb9edff811760a892fddd..dcb29215509d734cb947312f3f606e5d7e4134f7 100644
--- a/RTCP/InputProc/src/SampleBuffer.h
+++ b/RTCP/InputProc/src/SampleBuffer.h
@@ -10,6 +10,7 @@
 #include "Ranges.h"
 #include "SampleType.h"
 #include <string>
+#include <vector>
 
 namespace LOFAR {
 namespace RTCP {
@@ -28,7 +29,7 @@ private:
 
   static size_t dataSize( const struct BufferSettings &settings ) {
     return sizeof settings
-         + NR_RSPBOARDS * (Ranges::size(settings.nrFlagRanges) + 8)
+         + settings.nrBoards * (Ranges::size(settings.nrFlagRanges) + 8)
          + settings.nrBeamlets * (settings.nrSamples * sizeof(T) + 128);
   }