diff --git a/Makefile.sysmenu b/Makefile.sysmenu
index 47e23338..28cbcf5c 100644
--- a/Makefile.sysmenu
+++ b/Makefile.sysmenu
@@ -25,7 +25,8 @@ include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 export TWL_ARCHGEN = ALL
 
 SUBDIRS =	\
-			build/libraries_sysmenu\
+			build/tools \
+			build/libraries_sysmenu \
 			build/components \
 			build/systemmenu_RED
 
diff --git a/build/components/Makefile b/build/components/Makefile
index 466e4fce..bfd7acf1 100644
--- a/build/components/Makefile
+++ b/build/components/Makefile
@@ -12,8 +12,8 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------
 
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile
index 93a17739..52711676 100644
--- a/build/components/hyena.TWL/Makefile
+++ b/build/components/hyena.TWL/Makefile
@@ -25,7 +25,8 @@ TWL_CODEGEN					?=	ARM
 
 #----------------------------------------------------------------------------
 
-SUBDIRS			=	wram_regs
+SUBDIRS			=	$(SYSMENU_ROOT)/build/libraries/aes \
+					wram_regs
 
 SRCS			=	main.c \
 					initScfg.c \
diff --git a/build/systemMenu_RED/Makefile b/build/systemMenu_RED/Makefile
index 301ace0a..0a116d64 100644
--- a/build/systemMenu_RED/Makefile
+++ b/build/systemMenu_RED/Makefile
@@ -20,8 +20,15 @@ include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-SUBDIRS_P	=	launcher MachineSettings PictoChat HWInfoWriter \
-				NandInitializerRed NandInitializerProduction NandInitializer wlanfirm
+SUBDIRS_P	=	\
+				launcher \
+				MachineSettings \
+				PictoChat \
+				HWInfoWriter \
+				NandInitializerRed \
+				NandInitializerProduction \
+				NandInitializer \
+				wlanfirm
 				#DS_DownloadPlay
 
 #----------------------------------------------------------------------------
diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile
index d67290db..5e588035 100644
--- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile
+++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile
@@ -16,7 +16,7 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-SUBDIRS		=
+SUBDIRS		=	$(ROOT)/build/demos/gx/UnitTours/DEMOLib
 
 #----------------------------------------------------------------------------
 
diff --git a/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile
index 8da82bee..699f682e 100644
--- a/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile
+++ b/build/systemMenu_RED/NandInitializerProduction/ARM9.TWL/Makefile
@@ -16,7 +16,7 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-SUBDIRS		=
+SUBDIRS		=	$(ROOT)/build/demos/gx/UnitTours/DEMOLib
 
 
 #----------------------------------------------------------------------------
diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile
index 9a3fb7b0..191eb3d2 100644
--- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile
+++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/Makefile
@@ -16,7 +16,7 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-SUBDIRS		=
+SUBDIRS		=	$(ROOT)/build/demos/gx/UnitTours/DEMOLib
 
 
 #----------------------------------------------------------------------------