diff --git a/Common/ChunkFile.h b/Common/ChunkFile.h
index 6229bb4e54..09773a7974 100644
--- a/Common/ChunkFile.h
+++ b/Common/ChunkFile.h
@@ -39,13 +39,11 @@
 #include "FileUtil.h"
 #include "../ext/snappy/snappy-c.h"
 
-#ifndef _MSC_VER
-#ifndef __APPLE__
+#ifdef ANDROID
 namespace std {
 	using tr1::is_pointer;
 }
 #endif
-#endif
 
 template <class T>
 struct LinkedListItem : public T
diff --git a/Core/HLE/sceCtrl.h b/Core/HLE/sceCtrl.h
index fa61316030..f28ecae304 100644
--- a/Core/HLE/sceCtrl.h
+++ b/Core/HLE/sceCtrl.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 class PointerWrap;
 
 void Register_sceCtrl();
@@ -45,4 +47,4 @@ void __CtrlSetAnalog(float x, float y);
 
 // For use by internal UI like MsgDialog
 u32 __CtrlPeekButtons();
-u32 __CtrlReadLatch();
\ No newline at end of file
+u32 __CtrlReadLatch();