diff --git a/src/debugger/debugger.h b/src/debugger/debugger.h
index d2384e979..eed03e8c5 100644
--- a/src/debugger/debugger.h
+++ b/src/debugger/debugger.h
@@ -5,7 +5,7 @@
 
 #include "arm.h"
 
-const uint32_t ARM_DEBUGGER_ID;
+extern const uint32_t ARM_DEBUGGER_ID;
 
 enum DebuggerState {
 	DEBUGGER_PAUSED,
diff --git a/src/util/socket.h b/src/util/socket.h
index 8e04477b0..9146b15a7 100644
--- a/src/util/socket.h
+++ b/src/util/socket.h
@@ -3,6 +3,10 @@
 
 #include "common.h"
 
+#ifdef __cplusplus
+#define restrict __restrict__
+#endif
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>