diff --git a/include/dsp.h b/include/dsp.h
index b4b5c740375..b4a7f1462e2 100644
--- a/include/dsp.h
+++ b/include/dsp.h
@@ -27,6 +27,7 @@
 
 #include <nuttx/compiler.h>
 
+#include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -36,7 +37,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Disable DEBUGASSERT macro if LIBDSP debug is not enabled */
+/* Disable DEBUGASSER macro if LIBDSP debug is not enabled */
 
 #ifdef CONFIG_LIBDSP_DEBUG
 #  ifndef CONFIG_DEBUG_ASSERTIONS
diff --git a/include/dspb16.h b/include/dspb16.h
index 1476e523b96..deef6128a6b 100644
--- a/include/dspb16.h
+++ b/include/dspb16.h
@@ -27,6 +27,7 @@
 
 #include <nuttx/compiler.h>
 
+#include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/libs/libdsp/lib_avg.c b/libs/libdsp/lib_avg.c
index bb8fd171c06..b552c301279 100644
--- a/libs/libdsp/lib_avg.c
+++ b/libs/libdsp/lib_avg.c
@@ -22,7 +22,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <assert.h>
 #include <dsp.h>
 #include <string.h>
 
diff --git a/libs/libdsp/lib_foc.c b/libs/libdsp/lib_foc.c
index 9f08b753d0e..332c259016d 100644
--- a/libs/libdsp/lib_foc.c
+++ b/libs/libdsp/lib_foc.c
@@ -22,10 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
-#include <stdbool.h>
-
 #include <dsp.h>
+#include <string.h>
 
 /****************************************************************************
  * Private Functions
diff --git a/libs/libdsp/lib_foc_b16.c b/libs/libdsp/lib_foc_b16.c
index 898fac65954..81a8f412244 100644
--- a/libs/libdsp/lib_foc_b16.c
+++ b/libs/libdsp/lib_foc_b16.c
@@ -22,10 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <string.h>
-#include <stdbool.h>
-
 #include <dspb16.h>
+#include <string.h>
 
 /****************************************************************************
  * Private Functions
diff --git a/libs/libdsp/lib_pmsm_model.c b/libs/libdsp/lib_pmsm_model.c
index 4a2c6871186..9f617512514 100644
--- a/libs/libdsp/lib_pmsm_model.c
+++ b/libs/libdsp/lib_pmsm_model.c
@@ -109,9 +109,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <assert.h>
 #include <dsp.h>
 #include <string.h>
 
diff --git a/libs/libdsp/lib_pmsm_model_b16.c b/libs/libdsp/lib_pmsm_model_b16.c
index b2bd9bc6c85..262922dfe5e 100644
--- a/libs/libdsp/lib_pmsm_model_b16.c
+++ b/libs/libdsp/lib_pmsm_model_b16.c
@@ -22,9 +22,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/config.h>
-
-#include <assert.h>
 #include <dspb16.h>
 #include <string.h>
 
diff --git a/libs/libdsp/lib_svm.c b/libs/libdsp/lib_svm.c
index 03546bff6ff..c4119dadd5b 100644
--- a/libs/libdsp/lib_svm.c
+++ b/libs/libdsp/lib_svm.c
@@ -22,7 +22,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <assert.h>
 #include <dsp.h>
 #include <string.h>
 
diff --git a/libs/libdsp/lib_svm_b16.c b/libs/libdsp/lib_svm_b16.c
index 7f26717b1cc..175530139b9 100644
--- a/libs/libdsp/lib_svm_b16.c
+++ b/libs/libdsp/lib_svm_b16.c
@@ -22,7 +22,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <assert.h>
 #include <dspb16.h>
 #include <string.h>