diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs
index 56c531e..3fb9c32 100644
--- a/build/buildtools/commondefs
+++ b/build/buildtools/commondefs
@@ -245,13 +245,9 @@ include $(TWL_BUILDTOOLSDIR)/commondefs.emtype.ISD
 
 GINCLUDES		:= $(TWL_INCDIR) $(TWL_ISD_INCDIRS) $(GINCLUDES)
 GLIBRARY_DIRS	:= $(TWL_LIBDIR) $(dir $(TWL_LIBSYSCALL)) $(TWL_ISD_LIBDIRS) $(GLIBRARY_DIRS)
-GLIBRARIES		:= $(TWL_LIBS) \
+GLIBRARIES		:= $(TWL_LIBS) $(TWL_ISD_LIBS) \
 					$(filter-out $(addsuffix $(NITRO_LIBSUFFIX).a,$(TWL_LIBS_BASE)),$(GLIBRARIES))
 
-ifdef	IS_TWL_DEBUGGER_DIR
-GLIBRARY_DIRS	:= $(filter-out $(ISD_LIBDIRS),$(GLIBRARY_DIRS))
-endif
-
 #----------------------------------------------------------------------------
 #  TWLSDK_INSTALL_ROOT
 #
diff --git a/build/buildtools/commondefs.emtype.ISD b/build/buildtools/commondefs.emtype.ISD
index fd969d7..dfad410 100644
--- a/build/buildtools/commondefs.emtype.ISD
+++ b/build/buildtools/commondefs.emtype.ISD
@@ -31,12 +31,24 @@ TWL_ISD_ROOT_NOSPACE	:= $(subst \,/,$(shell cygpath -d $(TWL_ISD_ROOT)))
 ifeq	($(CODEGEN_PROC),ARM9)
 
 TWL_ISD_INCDIRS	:= $(TWL_ISD_ROOT)/Target/include/ARM9
-TWL_ISD_LIBDIRS	:= $(TWL_ISD_ROOT_NOSPACE)/Target\lib\ARM9-TS
+TWL_ISD_LIBDIRS	:= $(TWL_ISD_ROOT_NOSPACE)/Target/lib/ARM9-TS
+
+ifeq	($(TWL_CODEGEN),ARM)
+TWL_ISD_LIBS    := libistdmainparm.a
+else #	($(TWL_CODEGEN),THUMB)
+TWL_ISD_LIBS    := libistdmainpthumb.a
+endif
 
 else #	($(CODEGEN_PROC),ARM7)
 
 TWL_ISD_INCDIRS	:= $(TWL_ISD_ROOT)/Target/include/ARM7
-TWL_ISD_LIBDIRS	:= $(TWL_ISD_ROOT_NOSPACE)/Target\lib\ARM7-TS
+TWL_ISD_LIBDIRS	:= $(TWL_ISD_ROOT_NOSPACE)/Target/lib/ARM7-TS
+
+ifeq	($(TWL_CODEGEN),ARM)
+TWL_ISD_LIBS    := libistdsubparm.a
+else #	($(TWL_CODEGEN),THUMB)
+TWL_ISD_LIBS    := libistdsubpthumb.a
+endif
 
 endif
 
diff --git a/build/libraries/os/common/os_printf.c b/build/libraries/os/common/os_printf.c
index fea9fa6..4d24fdb 100644
--- a/build/libraries/os/common/os_printf.c
+++ b/build/libraries/os/common/os_printf.c
@@ -184,14 +184,14 @@
  *---------------------------------------------------------------------------*/
 #include        <twl.h>
 #include        <twl/vlink.h>
-#include <isdbglibpriv.h>
+#include <istdbglibpriv.h>
 
 #ifdef          SDK_LINK_ISD
 # pragma warn_extracomma off
-# include       <isdbglib.h>           // has extracomma in enum
+# include       <istdbglib.h>          // has extracomma in enum
 # pragma warn_extracomma reset
 #else
-void    ISDPrint(const char *);
+void    ISTDPrint(const char *);
 #endif
 
 #ifndef SDK_FINALROM
@@ -284,7 +284,7 @@ static void OS_PutStringInit(const char *str)
 #endif
         OS_PutString = OS_PutStringKMC;
 #if defined( SDK_DEBUGGER_ISD )
-        _ISDbgLib_Initialize();
+        _ISTDbgLib_Initialize();
         OS_PutString = OS_PutStringISD;
 #elif defined( SDK_DEBUGGER_ARM )
         OS_PutString = OS_PutStringARM;
@@ -336,7 +336,7 @@ static void OS_PutStringISD(const char *str)
     // ISDPrint の初期化処理
     OS_InitLock();
 
-    OS_PutString = ISDPrint;
+    OS_PutString = ISTDPrint;
     OS_PutString(str);
 }
 #endif