8 files changed, 5 insertions, 5 deletions
diff --git a/hw/hank/noctigon-kr4-219/anduril.h b/hw/hank/noctigon-kr4/219/anduril.h
index cd3e118..cd3e118 100644
--- a/hw/hank/noctigon-kr4-219/anduril.h
+++ b/hw/hank/noctigon-kr4/219/anduril.h
diff --git a/hw/hank/noctigon-kr4-219b/anduril.h b/hw/hank/noctigon-kr4/219b/anduril.h
index 9c113f9..9c113f9 100644
--- a/hw/hank/noctigon-kr4-219b/anduril.h
+++ b/hw/hank/noctigon-kr4/219b/anduril.h
diff --git a/hw/hank/noctigon-kr4-2ch/anduril.h b/hw/hank/noctigon-kr4/2ch/anduril.h
index 9ebeb0b..be7c4d0 100644
--- a/hw/hank/noctigon-kr4-2ch/anduril.h
+++ b/hw/hank/noctigon-kr4/2ch/anduril.h
@@ -6,7 +6,7 @@
 // (basically the same as Emisar generic 2-channel build,
 // but switch on a different pin, and no lighted button)
 // ATTINY: 1634
-#include "hank/noctigon-kr4-2ch/hwdef.h"
+#include "hank/noctigon-kr4/2ch/hwdef.h"
 #include "hank/emisar-2ch/anduril.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0215"
diff --git a/hw/hank/noctigon-kr4-2ch/hwdef.h b/hw/hank/noctigon-kr4/2ch/hwdef.h
index 081fccc..081fccc 100644
--- a/hw/hank/noctigon-kr4-2ch/hwdef.h
+++ b/hw/hank/noctigon-kr4/2ch/hwdef.h
diff --git a/hw/hank/noctigon-kr4-boost/anduril.h b/hw/hank/noctigon-kr4/boost/anduril.h
index f0c5b92..a3b33ee 100644
--- a/hw/hank/noctigon-kr4-boost/anduril.h
+++ b/hw/hank/noctigon-kr4/boost/anduril.h
@@ -7,8 +7,8 @@
 // the only things different from dm11-boost are:
 // - e-switch is on a different pin (defined in hwdef)
 // - different model number
-#include "hank/noctigon-dm11-boost/anduril.h"
-#include "hank/noctigon-kr4-boost/hwdef.h"
+#include "hank/noctigon-dm11/boost/anduril.h"
+#include "hank/noctigon-kr4/boost/hwdef.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0216"
 #include "hank/anduril.h"
diff --git a/hw/hank/noctigon-kr4-boost/hwdef.h b/hw/hank/noctigon-kr4/boost/hwdef.h
index 1ee2627..f17d263 100644
--- a/hw/hank/noctigon-kr4-boost/hwdef.h
+++ b/hw/hank/noctigon-kr4/boost/hwdef.h
@@ -37,7 +37,7 @@
  * not to change brightness.
  */
 
-#include "hank/noctigon-dm11-boost/hwdef.h"
+#include "hank/noctigon-dm11/boost/hwdef.h"
 
 // e-switch is on a different pin
 #undef SWITCH_PIN
diff --git a/hw/hank/noctigon-kr4-nofet/anduril.h b/hw/hank/noctigon-kr4/nofet/anduril.h
index 0198e33..10c0bf8 100644
--- a/hw/hank/noctigon-kr4-nofet/anduril.h
+++ b/hw/hank/noctigon-kr4/nofet/anduril.h
@@ -5,7 +5,7 @@
 
 // (and Noctigon KR1)
 // (and Emisar D4v2 E21A, a.k.a. "D4v2.5")
-#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
+#define HWDEF_C_FILE hank/noctigon-kr4/nofet/hwdef.c
 #include "hank/noctigon-kr4/anduril.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0212"
diff --git a/hw/hank/noctigon-kr4-nofet/hwdef.c b/hw/hank/noctigon-kr4/nofet/hwdef.c
index 783eeed..783eeed 100644
--- a/hw/hank/noctigon-kr4-nofet/hwdef.c
+++ b/hw/hank/noctigon-kr4/nofet/hwdef.c