diff --git a/Source/Core/Core/Src/IPC_HLE/hci.h b/Source/Core/Core/Src/IPC_HLE/hci.h
index 150e81a709..e95a773490 100644
--- a/Source/Core/Core/Src/IPC_HLE/hci.h
+++ b/Source/Core/Core/Src/IPC_HLE/hci.h
@@ -79,12 +79,7 @@
 
 #pragma once
 
-#include <stdint.h>
-
-// All structs in this file are packed
-#pragma pack(push, 1)
-
-// This is not needed >= msvc10
+// msvc >= msvc10 has stdint.h/cstdint
 #ifdef _MSC_VER
 	typedef u8 uint8_t;
 	typedef s8 int8_t;
@@ -92,8 +87,13 @@
 	typedef s16 int16_t;
 	typedef u32 uint32_t;
 	typedef s32 int32_t;
+#else
+	#include <stdint.h>
 #endif
 
+// All structs in this file are packed
+#pragma pack(push, 1)
+
 /*
  * Bluetooth Address Family Protocol Numbers
  */
diff --git a/Source/Core/Core/Src/IPC_HLE/l2cap.h b/Source/Core/Core/Src/IPC_HLE/l2cap.h
index 5b1092c201..a3cff02187 100644
--- a/Source/Core/Core/Src/IPC_HLE/l2cap.h
+++ b/Source/Core/Core/Src/IPC_HLE/l2cap.h
@@ -68,6 +68,18 @@
 
 #pragma once
 
+// msvc >= msvc10 has stdint.h/cstdint
+#ifdef _MSC_VER
+	typedef u8 uint8_t;
+	typedef s8 int8_t;
+	typedef u16 uint16_t;
+	typedef s16 int16_t;
+	typedef u32 uint32_t;
+	typedef s32 int32_t;
+#else
+	#include <stdint.h>
+#endif
+
 /**************************************************************************
 **************************************************************************
 **                   Common defines and types (L2CAP)