diff --git a/trunk/bootrom/build/libraries/nand/ARM11/src/ne1/nand.c b/trunk/bootrom/build/libraries/nand/ARM11/src/ne1/nand.c
index 2b23ef7..1f734bb 100644
--- a/trunk/bootrom/build/libraries/nand/ARM11/src/ne1/nand.c
+++ b/trunk/bootrom/build/libraries/nand/ARM11/src/ne1/nand.c
@@ -12,7 +12,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <brom.h>
-#include <ctr/hw/ARM11/ioreg_MI.h>
+#include <ioreg_MI.h>
 #include <brom/nand/nand.h>
 
 #include "nandif_ip.h"
diff --git a/trunk/firmware/build/buildsetup/ioreg/Makefile b/trunk/firmware/build/buildsetup/ioreg/Makefile
index 9d0fcb0..f535e44 100644
--- a/trunk/firmware/build/buildsetup/ioreg/Makefile
+++ b/trunk/firmware/build/buildsetup/ioreg/Makefile
@@ -20,7 +20,7 @@ SUBDIRS			=
 
 #----------------------------------------------------------------------------
 
-WORKDIR			=	ctr/hw/ARM11
+WORKDIR			=	ctr/hw/ARM11/$(CTR_PLATFORM)
 TARGET			=	$(WORKDIR)/ioreg.h
 
 CSVSRC			=	io_register_list.csv
diff --git a/trunk/firmware/build/buildsetup/ioreg_sp/Makefile b/trunk/firmware/build/buildsetup/ioreg_sp/Makefile
index ad4cceb..ce92b5c 100644
--- a/trunk/firmware/build/buildsetup/ioreg_sp/Makefile
+++ b/trunk/firmware/build/buildsetup/ioreg_sp/Makefile
@@ -16,7 +16,7 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-WORKDIR			=	ctr/hw/ARM9
+WORKDIR			=	ctr/hw/ARM9/$(CTR_PLATFORM)
 TARGET			=	$(WORKDIR)/ioreg.h
 
 CSVSRC			=	io_register_list_sp.csv
diff --git a/trunk/public/build/buildtools/commondefs b/trunk/public/build/buildtools/commondefs
index dff94c7..8d713e3 100644
--- a/trunk/public/build/buildtools/commondefs
+++ b/trunk/public/build/buildtools/commondefs
@@ -366,6 +366,7 @@ ROOT				:= $(call eupath,$(CTRSDK_ROOT))
 CTR_BUILDTOOLSDIR	:= $(ROOT)/build/buildtools
 CTR_BUILDSETUPDIR	:= $(ROOT)/build/buildsetup
 CTR_INCDIR			:= $(ROOT)/include
+CTR_IOREG_INCDIR	:= $(CTR_INCDIR)/ctr/hw/$(CTR_PROC)/$(CTR_PLATFORM)
 CTR_TOOLSDIR		:= $(ROOT)/tools
 CTR_COMPONENTSDIR	:= $(ROOT)/components
 CTR_ADDINS		?= $(ROOT)/add-ins
@@ -554,7 +555,8 @@ endif
 
 DEFAULT_GINCLUDES	= $(INCDIR) $(SRCDIR)					\
 			   $(CTRSYSTEM_INCDIR) $(CTRWIRELESS_INCDIR)	\
-			   $(CTR_INCDIR) $(ISD_INCDIRS)
+			   $(CTR_INCDIR) $(ISD_INCDIRS) \
+			   $(CTR_IOREG_INCDIR) \
 
 DEFAULT_GLIBRARY_DIRS	= $(LIBDIR) $(dir $(LIBSYSCALL_))			\
 			   $(CTRSYSTEM_LIBDIR) $(CTRWIRELESS_LIBDIR)	\
diff --git a/trunk/public/include/ctr/ioreg.h b/trunk/public/include/ctr/ioreg.h
index 98c02eb..5eb2907 100644
--- a/trunk/public/include/ctr/ioreg.h
+++ b/trunk/public/include/ctr/ioreg.h
@@ -14,11 +14,9 @@
   $Rev$
   $Author$
  *---------------------------------------------------------------------------*/
+#include <ioreg.h>
 #ifdef	SDK_ARM11
-#include <ctr/hw/ARM11/ioreg.h>
 #ifdef	SDK_NE1EMU
-#include <ctr/hw/ARM11/ioreg_ne1patch.h>
+#include <ioreg_ne1patch.h>
 #endif // SDK_NE1EMU
-#else  //SDK_ARM9
-#include <ctr/hw/ARM9/ioreg.h>
-#endif
+#endif // SDK_ARM11