diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp
index 7188c05..e10c81f 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.cpp
@@ -82,14 +82,17 @@ std::string BgsCommunicator::GetXml()
 
 bool BgsCommunicator::Execute()
 {
+    return false;
 }
 
 size_t BgsCommunicator::GetBodySize()
 {
+    return 0;
 }
 
 void BgsCommunicator::GetBody(void *buf)
 {
+    NN_UNUSED_VAR(buf);
 }
 
 } /* namespace ConsoleRestore */
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h
index 8372fe7..6b8c53e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/BgsCommunicator.h
@@ -20,8 +20,7 @@
 #if     defined(__ARMCC_VERSION)
 #include <nn.h>
 #else
-#include <cstddef>
-#include "types.h"
+#include "test_common.h"
 #endif
 
 namespace ConsoleRestore
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h
index ca4522f..51a9179 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RegionIdModifier.h
@@ -19,9 +19,7 @@
 #include <nn.h>
 #include <nn/cfg.h>
 #else
-#include <cstddef>
-#include "types.h"
-#include "stub.h"
+#include "test_common.h"
 #endif
 
 const size_t PATHLIST_LENGTH = 32;
diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile
index eeff804..7416889 100644
--- a/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tests/googletest/BgsCommunicator/OMakefile
@@ -11,7 +11,7 @@ SRC_FILES[] =
 
 # テストディレクトリ外にあるので独自ルールでビルド
 BgsCommunicator$(EXT_OBJ): ../../../ConsoleRestore/BgsCommunicator.cpp
-    $(CXX) $(PREFIXED_INCLUDES) -c $<
+    $(CXX) $(CXXFLAGS) $(PREFIXED_INCLUDES) -c $<
 
 .DEFAULT: BgsCommunicator$(EXT_OBJ) $(TARGET)$(EXE)
 
diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
index 511d761..42de733 100644
--- a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
@@ -10,9 +10,11 @@ SRC_FILES[] =
                testUtil
                RegionIdModifier
 
+CXXFLAGS += -DPCTEST_USE_STUB
+
 # テストディレクトリ外にあるので独自ルールでビルド
 RegionIdModifier$(EXT_OBJ): ../../../ConsoleRestore/RegionIdModifier.cpp
-    $(CXX) $(PREFIXED_INCLUDES) -c $<
+    $(CXX) $(CXXFLAGS) $(PREFIXED_INCLUDES) -c $<
 
 .DEFAULT: RegionIdModifier$(EXT_OBJ) $(TARGET)$(EXE)