diff --git a/arch/sh/include/m16c/irq.h b/arch/sh/include/m16c/irq.h
index ad7e43ad93cd09940a502732bcc5ebba685fd938..8809d06e61067714ee9a2022808ef931fdb576d2 100644
--- a/arch/sh/include/m16c/irq.h
+++ b/arch/sh/include/m16c/irq.h
@@ -45,7 +45,9 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <stdint.h>
+#ifndef __ASSEMBLY__
+#  include <stdint.h>
+#endif
 
 /************************************************************************************
  * Definitions
diff --git a/arch/sh/src/common/up_doirq.c b/arch/sh/src/common/up_doirq.c
index 33d33a05267bd13a82ea64af9cfcd945a44151fd..6e64a623cc1d06e38ad1a6c938dd72cacd6b9b70 100644
--- a/arch/sh/src/common/up_doirq.c
+++ b/arch/sh/src/common/up_doirq.c
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <stdin.h>
+#include <stdint.h>
 #include <assert.h>
 
 #include <nuttx/irq.h>
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index 50dfc1e7ce7f1a48b7dce5d3330ecbccd9d09349..4baa36c967e843fe95db016ea9920bbb394f967d 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -254,7 +254,7 @@ CONFIG_DISABLE_CLOCK=n
 CONFIG_DISABLE_POSIX_TIMERS=n
 CONFIG_DISABLE_PTHREAD=n
 CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
+CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
 CONFIG_DISABLE_POLL=y