diff --git a/src/arm/debugger.c b/src/arm/debugger.c
index 37987c8e3..616500018 100644
--- a/src/arm/debugger.c
+++ b/src/arm/debugger.c
@@ -55,7 +55,7 @@ static void ARMDebuggerCheckBreakpoints(struct mDebuggerPlatform*);
 static bool ARMDebuggerHasBreakpoints(struct mDebuggerPlatform*);
 
 struct mDebuggerPlatform* ARMDebuggerPlatformCreate(void) {
-	struct mDebuggerPlatform* platform = malloc(sizeof(struct ARMDebugger));
+	struct mDebuggerPlatform* platform = (struct mDebuggerPlatform*) malloc(sizeof(struct ARMDebugger));
 	platform->entered = ARMDebuggerEnter;
 	platform->init = ARMDebuggerInit;
 	platform->deinit = ARMDebuggerDeinit;
diff --git a/src/lr35902/debugger.c b/src/lr35902/debugger.c
index f4159a1e4..aaf8c7571 100644
--- a/src/lr35902/debugger.c
+++ b/src/lr35902/debugger.c
@@ -45,7 +45,7 @@ static void LR35902DebuggerCheckBreakpoints(struct mDebuggerPlatform*);
 static bool LR35902DebuggerHasBreakpoints(struct mDebuggerPlatform*);
 
 struct mDebuggerPlatform* LR35902DebuggerPlatformCreate(void) {
-	struct mDebuggerPlatform* platform = malloc(sizeof(struct LR35902Debugger));
+	struct mDebuggerPlatform* platform = (struct mDebuggerPlatform*) malloc(sizeof(struct LR35902Debugger));
 	platform->entered = LR35902DebuggerEnter;
 	platform->init = LR35902DebuggerInit;
 	platform->deinit = LR35902DebuggerDeinit;
@@ -72,6 +72,8 @@ void LR35902DebuggerDeinit(struct mDebuggerPlatform* platform) {
 }
 
 static void LR35902DebuggerEnter(struct mDebuggerPlatform* platform, enum mDebuggerEntryReason reason, struct mDebuggerEntryInfo* info) {
+	UNUSED(reason);
+	UNUSED(info);
 	struct LR35902Debugger* debugger = (struct LR35902Debugger*) platform;
 	struct LR35902Core* cpu = debugger->cpu;
 	cpu->nextEvent = cpu->cycles;
diff --git a/src/platform/commandline.c b/src/platform/commandline.c
index 4d67a6675..30eb9a768 100644
--- a/src/platform/commandline.c
+++ b/src/platform/commandline.c
@@ -4,6 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "commandline.h"
+
+#include "core/config.h"
 #include "util/string.h"
 
 #include <fcntl.h>