diff --git a/examples/foc/foc_fixed16_thr.c b/examples/foc/foc_fixed16_thr.c
index 2ba2998e60e..3c9a8c77b29 100644
--- a/examples/foc/foc_fixed16_thr.c
+++ b/examples/foc/foc_fixed16_thr.c
@@ -26,6 +26,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/spinlock.h>
+
 #include <assert.h>
 #include <dspb16.h>
 #include <fcntl.h>
diff --git a/examples/foc/foc_float_thr.c b/examples/foc/foc_float_thr.c
index af967f255a3..4c52b86bf6e 100644
--- a/examples/foc/foc_float_thr.c
+++ b/examples/foc/foc_float_thr.c
@@ -26,6 +26,8 @@
 
 #include <nuttx/config.h>
 
+#include <nuttx/spinlock.h>
+
 #include <assert.h>
 #include <dsp.h>
 #include <fcntl.h>
diff --git a/testing/ostest/wdog.c b/testing/ostest/wdog.c
index c00a7f9b6e0..273a680e916 100644
--- a/testing/ostest/wdog.c
+++ b/testing/ostest/wdog.c
@@ -147,7 +147,7 @@ static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
   clock_t    wdset_tick;
   sclock_t   delay_tick;
   sclock_t   diff;
-  irqstate_t flags;
+  irqstate_t flags = 0;
 
   /* Perform multiple iterations with random delays. */