diff --git a/debuggers/openocd/src/helper/command.h b/debuggers/openocd/src/helper/command.h
index e50fff2e..eb303313 100644
--- a/debuggers/openocd/src/helper/command.h
+++ b/debuggers/openocd/src/helper/command.h
@@ -24,7 +24,8 @@
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include <jim-nvp.h>
+#include <helper/types.h>
+#include <helper/jim-nvp.h>
 
 /* To achieve C99 printf compatibility in MinGW, gnu_printf should be
  * used for __attribute__((format( ... ))), with GCC v4.4 or later
diff --git a/debuggers/openocd/src/target/target_type.h b/debuggers/openocd/src/target/target_type.h
index 5b72d841..4a2705c8 100644
--- a/debuggers/openocd/src/target/target_type.h
+++ b/debuggers/openocd/src/target/target_type.h
@@ -27,7 +27,7 @@
 #ifndef TARGET_TYPE_H
 #define TARGET_TYPE_H
 
-#include <jim-nvp.h>
+#include <helper/jim-nvp.h>
 
 struct target;