diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h
index 5130d98d601..ec9ea73dc28 100644
--- a/include/nuttx/arch.h
+++ b/include/nuttx/arch.h
@@ -2183,7 +2183,7 @@ size_t  up_check_tcbstack(FAR struct tcb_s *tcb);
 ssize_t up_check_tcbstack_remain(FAR struct tcb_s *tcb);
 size_t  up_check_stack(void);
 ssize_t up_check_stack_remain(void);
-#if CONFIG_ARCH_INTERRUPTSTACK > 3
+#if defined(CONFIG_ARCH_INTERRUPTSTACK) && CONFIG_ARCH_INTERRUPTSTACK > 3
 size_t  up_check_intstack(void);
 size_t  up_check_intstack_remain(void);
 #endif
diff --git a/include/nuttx/audio/audio_i2s.h b/include/nuttx/audio/audio_i2s.h
index d9f547cef52..89d7748cbdb 100644
--- a/include/nuttx/audio/audio_i2s.h
+++ b/include/nuttx/audio/audio_i2s.h
@@ -41,6 +41,9 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
+#ifdef CONFIG_AUDIO_I2S
+
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/i2s.h>
 
@@ -51,4 +54,6 @@
 FAR struct audio_lowerhalf_s *audio_i2s_initialize(FAR struct i2s_dev_s *i2s,
                                                    bool playback);
 
+#endif /* CONFIG_AUDIO_I2S */
+
 #endif
diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h
index ce354dcdf84..912f9aede9a 100644
--- a/include/nuttx/clock.h
+++ b/include/nuttx/clock.h
@@ -202,7 +202,7 @@
 #define TICK2SEC(tick)        (((tick)+(TICK_PER_SEC/2))/TICK_PER_SEC)   /* Rounds */
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SYSTEM_TIME64) && \
-    defined(CONFIG_CLOCK_MONOTONIC)
+    defined(CONFIG_CLOCK_MONOTONIC) && !defined(CONFIG_SCHED_TICKLESS)
 /* Initial system timer ticks value close to maximum 32-bit value, to test
  * 64-bit system-timer after going over 32-bit value. This is to make errors
  * of casting 64-bit system-timer to 32-bit variables more visible.