diff --git a/trunk/ConsoleDataMigration/sources/OMakeroot b/trunk/ConsoleDataMigration/sources/OMakeroot
index 7ee1cb5..446b75e 100644
--- a/trunk/ConsoleDataMigration/sources/OMakeroot
+++ b/trunk/ConsoleDataMigration/sources/OMakeroot
@@ -59,7 +59,8 @@ if $(not $(HORIZON_ROOT))
     eprintln($"$$CTRSDK_ROOT が定義されていません")
     exit(1)
 
-include $(HORIZON_ROOT)/build/omake/commondefs
+oms = $(glob iD,$(HORIZON_ROOT)/build/omake*)
+include $(nth 0, $(rev $(set $(oms))))/commondefs
 
 DefineCommandVars()
 
diff --git a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/OMakefile b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/OMakefile
index 30f3b2d..e0a7e4f 100644
--- a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/OMakefile
@@ -33,7 +33,6 @@ TEST_COMMON_SOURCES[] =
                         ../../../common/LogConsole.cpp
                         ../../../common/CommonLogger.cpp
                         ../../../common/SdMountManager.cpp
-                        ../../../common/PlayHistoryManager.cpp
                         ../../../common/VersionDetect.cpp
                         ../../../common/HardwareStateManager.cpp
                         ../../../common/FileTransfer.cpp
@@ -56,7 +55,7 @@ LIBS                +=  libnn_test \
 
 
 ROM_SPEC_FILE       =   ../../../ConsoleRestore/ConsoleRestore.rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/private/RepairTool.desc
 
 
 include $(makePlatformDefsPath build.tests)
diff --git a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp
index 97adbe2..ddd1aa2 100644
--- a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp
+++ b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/TitleDownloader/test_TitleDownloader.cpp
@@ -66,10 +66,10 @@ bool TitleDownloaderTest::InitializeSuite()
     nn::am::InitializeForSystemMenu();
 
     // 繝偵�ｼ繝励�ｮ遒ｺ菫�
-    common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
+    common::HeapManager gxHeap(s_GxHeapSize);
 
     // RenderSystem 縺ｮ貅門ｙ
-    uptr heapForGx = reinterpret_cast<uptr>(common::HeapManager::GetHeap()->Allocate(s_GxHeapSize));
+    uptr heapForGx = reinterpret_cast<uptr>(gxHeap.GetAddr());
     demo::RenderSystemDrawing renderSystem;
     renderSystem.Initialize(heapForGx, s_GxHeapSize);