diff --git a/src/gdbstub.cpp b/src/gdbstub.cpp
index 4bb585c..2f62a60 100644
--- a/src/gdbstub.cpp
+++ b/src/gdbstub.cpp
@@ -1,4 +1,3 @@
-#include "api.hpp"
 #include <CLI/App.hpp>
 #include <CLI/Error.hpp>
 #include <cstring>
@@ -7,7 +6,19 @@
 #include <sstream>
 extern "C" {
 #include <gdbstub.h>
+}
 
+static std::vector<std::string> split_into_args(const std::string &command) {
+  std::istringstream iss(command);
+  std::vector<std::string> args;
+  std::string token;
+  while (iss >> token) {
+    args.push_back(token);
+  }
+  return args;
+}
+
+extern "C" {
 static void difftest_cont(void *args, gdb_action_t *res) {
   Difftest *diff = (Difftest *)args;
   *res = diff->cont();
@@ -54,16 +65,6 @@ static void difftest_on_interrupt(void *args) {
   diff->halt();
 }
 
-std::vector<std::string> split_into_args(const std::string &command) {
-  std::istringstream iss(command);
-  std::vector<std::string> args;
-  std::string token;
-  while (iss >> token) {
-    args.push_back(token);
-  }
-  return args;
-}
-
 static char *gdbstub_monitor(void *args, const char *s) {
   Difftest *diff = (Difftest *)args;
   spdlog::trace("monitor");