diff --git a/externals/nihstro b/externals/nihstro
index 4a78588b3..81f1804a4 160000
--- a/externals/nihstro
+++ b/externals/nihstro
@@ -1 +1 @@
-Subproject commit 4a78588b308564f7ebae193e0ae00d9a0d5741d5
+Subproject commit 81f1804a43f625e3a1a20752c0db70a413410380
diff --git a/src/binary_translation/CodeGen.cpp b/src/binary_translation/CodeGen.cpp
index 1181b0bd2..c9df42e49 100644
--- a/src/binary_translation/CodeGen.cpp
+++ b/src/binary_translation/CodeGen.cpp
@@ -2,6 +2,7 @@
 #include "ModuleGen.h"
 
 #include "core/loader/loader.h"
+#include "common/logging/log.h"
 
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/Host.h>
diff --git a/src/binary_translation/ModuleGen.cpp b/src/binary_translation/ModuleGen.cpp
index 15e366035..7b17acaa0 100644
--- a/src/binary_translation/ModuleGen.cpp
+++ b/src/binary_translation/ModuleGen.cpp
@@ -5,6 +5,7 @@
 #include "Instructions/Instruction.h"
 #include "Instructions/Types.h"
 #include "InstructionBlock.h"
+#include "common/logging/log.h"
 #include <llvm/IR/Function.h>
 #include <llvm/IR/GlobalVariable.h>
 #include <stack>
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 614c1e76f..6a4987cb9 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -3687,7 +3687,7 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
     Common::Profiling::ScopeTimer timer_execute(profile_execute);
 
 #if ENABLE_BINARY_TRANSLATION
-    BinaryTranslationLoader::SetCpuState(state);
+    BinaryTranslationLoader::SetCpuState(cpu);
 #endif
 
     #undef RM
diff --git a/src/core/binary_translation/BinaryTranslationLoader.cpp b/src/core/binary_translation/BinaryTranslationLoader.cpp
index b662050fd..e2598b89b 100644
--- a/src/core/binary_translation/BinaryTranslationLoader.cpp
+++ b/src/core/binary_translation/BinaryTranslationLoader.cpp
@@ -1,5 +1,6 @@
 #include "BinaryTranslationLoader.h"
 #include "core/arm/skyeye_common/armdefs.h"
+#include "common/logging/log.h"
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/ADT/STLExtras.h>
 #include <llvm/Support/MemoryBuffer.h>
diff --git a/src/core/binary_translation/BinaryTranslationLoader.h b/src/core/binary_translation/BinaryTranslationLoader.h
index 523588a92..b1a33a7a5 100644
--- a/src/core/binary_translation/BinaryTranslationLoader.h
+++ b/src/core/binary_translation/BinaryTranslationLoader.h
@@ -1,4 +1,3 @@
-#include "common/common.h"
 #include "common/file_util.h"
 #include <memory>