diff --git a/docs/api.rst b/docs/api.rst
index d2ee6c69..dc73c2c7 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -4,6 +4,7 @@ API
 .. toctree::
    :maxdepth: 4
 
+   api/cfdp
    api/objectmanager
    api/task
    api/ipc
diff --git a/docs/api/cfdp.rst b/docs/api/cfdp.rst
new file mode 100644
index 00000000..335a2025
--- /dev/null
+++ b/docs/api/cfdp.rst
@@ -0,0 +1,8 @@
+CFDP API
+=================
+
+``UserBase``
+-----------------
+
+.. doxygenclass:: cfdp::UserBase
+	:members:
\ No newline at end of file
diff --git a/docs/highlevel.rst b/docs/highlevel.rst
index 04eb5e7b..78ad53ff 100644
--- a/docs/highlevel.rst
+++ b/docs/highlevel.rst
@@ -7,12 +7,14 @@ Structure
 ----------
 
 The general structure is driven by the usage of interfaces provided by objects.
-The FSFW uses C++11 as baseline. The intention behind this is that this C++ Standard should be
-widely available, even with older compilers.
-The FSFW uses dynamic allocation during the initialization but provides static containers during runtime.
-This simplifies the instantiation of objects and allows the usage of some standard containers.
-Dynamic Allocation after initialization is discouraged and different solutions are provided in the
-FSFW to achieve that. The fsfw uses run-time type information but exceptions are not allowed.
+The FSFW uses C++17 as baseline.
+It also uses dynamic allocation during the initialization but provides
+static containers during runtime.
+This simplifies the instantiation of objects and allows the usage of some
+standard containers.
+Dynamic Allocation after initialization is discouraged and different solutions
+are provided in the FSFW to achieve that. The fsfw uses run-time type
+information but will not throw exceptions.
 
 Failure Handling
 -----------------
diff --git a/src/fsfw/cfdp/handler/mib.h b/src/fsfw/cfdp/handler/mib.h
index e78b0f4f..d5e687b4 100644
--- a/src/fsfw/cfdp/handler/mib.h
+++ b/src/fsfw/cfdp/handler/mib.h
@@ -3,6 +3,7 @@
 
 #include <utility>
 
+#include "fsfw/cfdp/pdu/PduConfig.h"
 #include "FaultHandlerBase.h"
 
 namespace cfdp {