diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile
index 8d0c9221..8db22b38 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile
+++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile
@@ -26,7 +26,7 @@ TARGET_PLATFORM	=	TWL
 TWL_ARCHGEN		=	LIMITED
 TWL_PROC	   	=	ARM9
 
-SRCS			=	sysmenu_lib.c sysmenu_card.c sysmenu_util.c gameBoot.c ninLogoFunc.c cmn.c \
+SRCS			=	sysmenu_lib.c sysmenu_card.c sysmenu_util.c gameBoot.c ninLogoFunc.c \
 					settingsAPI.c mountInfo.c
 
 TARGET_LIB		=	libsysmenu$(TWL_LIBSUFFIX).a
diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile
index 967679d9..b4baea64 100644
--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------
 
 SUBDIRS					=	\
-#							../../../libraries_sysmenu/sysmenu \
+							../../../libraries_sysmenu/sysmenu \
 #							../../../libraries_sysmenu/boot \
 #							../../../components/hyena.TWL
 
@@ -41,7 +41,7 @@ MISC_DIR				=	../../misc
 SRCS_LOGO				=	logoDemo.c logoData.c
 SRCS					=	main.c launcher.c \
 							$(addprefix $(LOGO_DIR)/, $(SRCS_LOGO)) \
-							$(MISC_DIR)/src/misc.c
+							$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c
 
 LINCLUDES				=	$(MISC_DIR)/include \
 							$(SRCDIR)/$(LOGO_DIR)
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
index 9fd57652..7df9c253 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile
+++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
@@ -35,7 +35,7 @@ MISC_DIR				=	../../misc
 
 SRCS					=	main.c MachineSetting.c \
 							setRTC.c selectLanguage.c calibrationTP.c setOwnerInfo.c \
-							$(MISC_DIR)/src/misc.c
+							$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c
 
 LINCLUDES				=	$(MISC_DIR)/include
 
diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile
index 84426682..55916d0f 100644
--- a/build/systemMenu_RED/PictoChat/ARM9/Makefile
+++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile
@@ -34,7 +34,7 @@ ROM_SPEC				=	main.rsf
 MISC_DIR				=	../../misc
 
 SRCS					=	main.c PictoChat.c \
-							$(MISC_DIR)/src/misc.c
+							$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c
 
 LINCLUDES				=	$(MISC_DIR)/include
 
diff --git a/include/sysmenu/sysmenu_lib/ARM9/cmn.h b/build/systemMenu_RED/misc/include/cmn.h
similarity index 100%
rename from include/sysmenu/sysmenu_lib/ARM9/cmn.h
rename to build/systemMenu_RED/misc/include/cmn.h
diff --git a/build/systemMenu_RED/misc/include/misc.h b/build/systemMenu_RED/misc/include/misc.h
index c2178276..030e2599 100644
--- a/build/systemMenu_RED/misc/include/misc.h
+++ b/build/systemMenu_RED/misc/include/misc.h
@@ -27,6 +27,8 @@
 #include <nnsys/g2d/g2d_CharCanvas.h>
 #include <nnsys/g2d/g2d_TextCanvas.h>
 
+#include "cmn.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/cmn.c b/build/systemMenu_RED/misc/src/cmn.c
similarity index 96%
rename from build/libraries_sysmenu/sysmenu/ARM9/src/cmn.c
rename to build/systemMenu_RED/misc/src/cmn.c
index 055928d3..333fac13 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/cmn.c
+++ b/build/systemMenu_RED/misc/src/cmn.c
@@ -18,7 +18,7 @@
 #include <twl.h>
 #include <nnsys.h>
 
-#include <sysmenu/sysmenu_lib/ARM9/cmn.h>
+#include "cmn.h"
 
 
 /*---------------------------------------------------------------------------*
diff --git a/include/sysmenu/sysmenu_lib.h b/include/sysmenu/sysmenu_lib.h
index d0565c02..63398473 100644
--- a/include/sysmenu/sysmenu_lib.h
+++ b/include/sysmenu/sysmenu_lib.h
@@ -19,7 +19,6 @@
 #define SYSM_SYSMENU_LIB_H_
 
 #ifdef SDK_ARM9
-#include <sysmenu/sysmenu_lib/ARM9/cmn.h>
 #include <sysmenu/sysmenu_lib/ARM9/sysmenu_api.h>
 #endif // SDK_ARM9