diff --git a/src/command.c b/src/command.c
index 46163fd0..e1ed837a 100644
--- a/src/command.c
+++ b/src/command.c
@@ -35,6 +35,10 @@
 
 #include "adiv5.h"
 
+#ifdef PLATFORM_HAS_TRACESWO
+#	include "traceswo.h"
+#endif
+
 static bool cmd_version(void);
 static bool cmd_help(target *t);
 
diff --git a/src/stm32f4.c b/src/stm32f4.c
index 67c44b84..b9764cc9 100644
--- a/src/stm32f4.c
+++ b/src/stm32f4.c
@@ -37,6 +37,7 @@
 #include "adiv5.h"
 #include "target.h"
 #include "command.h"
+#include "gdb_packet.h"
 
 static bool stm32f4_cmd_erase_mass(target *t);
 static bool stm32f4_cmd_option(target *t, int argc, char *argv[]);