diff --git a/src/main/ezusb-iidx-16seg-emu/Module.mk b/src/main/ezusb-iidx-16seg-emu/Module.mk
new file mode 100644
index 0000000..92ad9a0
--- /dev/null
+++ b/src/main/ezusb-iidx-16seg-emu/Module.mk
@@ -0,0 +1,5 @@
+libs            += ezusb-iidx-16seg-emu
+
+src_ezusb-iidx-16seg-emu     := \
+    node-16seg.c \
+    nodes.c \
diff --git a/src/main/ezusb-iidx-emu/node-16seg.c b/src/main/ezusb-iidx-16seg-emu/node-16seg.c
similarity index 95%
rename from src/main/ezusb-iidx-emu/node-16seg.c
rename to src/main/ezusb-iidx-16seg-emu/node-16seg.c
index 64cf4b4..89bc507 100644
--- a/src/main/ezusb-iidx-emu/node-16seg.c
+++ b/src/main/ezusb-iidx-16seg-emu/node-16seg.c
@@ -1,6 +1,6 @@
 #define LOG_MODULE "ezusb-iidx-emu-node-16seg"
 
-#include "ezusb-iidx-emu/node-16seg.h"
+#include "ezusb-iidx-16seg-emu/node-16seg.h"
 
 #include <string.h>
 
diff --git a/src/main/ezusb-iidx-emu/node-16seg.h b/src/main/ezusb-iidx-16seg-emu/node-16seg.h
similarity index 100%
rename from src/main/ezusb-iidx-emu/node-16seg.h
rename to src/main/ezusb-iidx-16seg-emu/node-16seg.h
diff --git a/src/main/ezusb-iidx-16seg-emu/nodes.c b/src/main/ezusb-iidx-16seg-emu/nodes.c
new file mode 100644
index 0000000..3577385
--- /dev/null
+++ b/src/main/ezusb-iidx-16seg-emu/nodes.c
@@ -0,0 +1,16 @@
+/*
+ * This file contains the ezusb nodes that appeared on
+ * all IIDX games so far.
+ */
+
+#include "ezusb-iidx/msg.h"
+
+#include "ezusb-iidx-16seg-emu/node-16seg.h"
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg = {
+    .node_id = EZUSB_IIDX_MSG_NODE_16SEG,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_16seg_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_16seg_read_packet,
+    .write_packet = ezusb_iidx_emu_node_16seg_write_packet};
diff --git a/src/main/ezusb-iidx-16seg-emu/nodes.h b/src/main/ezusb-iidx-16seg-emu/nodes.h
new file mode 100644
index 0000000..6a12f0c
--- /dev/null
+++ b/src/main/ezusb-iidx-16seg-emu/nodes.h
@@ -0,0 +1,8 @@
+#ifndef EZUSBEMU_NODES_16SEG_IIDX_H
+#define EZUSBEMU_NODES_16SEG_IIDX_H
+
+#include "ezusb-emu/node.h"
+
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg;
+
+#endif
diff --git a/src/main/ezusb-iidx-emu/Module.mk b/src/main/ezusb-iidx-emu/Module.mk
index cdf2fc0..d625363 100644
--- a/src/main/ezusb-iidx-emu/Module.mk
+++ b/src/main/ezusb-iidx-emu/Module.mk
@@ -2,11 +2,11 @@ libs            += ezusb-iidx-emu
 
 libs_ezusb-iidx-emu      := \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
 
 src_ezusb-iidx-emu     := \
     card-mag.c \
     msg.c \
-    node-16seg.c \
     node-fpga.c \
     node-serial.c \
     nodes.c \
diff --git a/src/main/ezusb-iidx-emu/msg.c b/src/main/ezusb-iidx-emu/msg.c
index b464b31..55b94e1 100644
--- a/src/main/ezusb-iidx-emu/msg.c
+++ b/src/main/ezusb-iidx-emu/msg.c
@@ -18,6 +18,8 @@
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 
+#include "ezusb-iidx-16seg-emu/nodes.h"
+
 #include "util/hex.h"
 #include "util/log.h"
 
diff --git a/src/main/ezusb-iidx-emu/nodes.c b/src/main/ezusb-iidx-emu/nodes.c
index 8814347..9bcc976 100644
--- a/src/main/ezusb-iidx-emu/nodes.c
+++ b/src/main/ezusb-iidx-emu/nodes.c
@@ -5,19 +5,10 @@
 
 #include "ezusb-iidx/msg.h"
 
-#include "ezusb-iidx-emu/node-16seg.h"
 #include "ezusb-iidx-emu/node-fpga.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 
-/* All IIDX games */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg = {
-    .node_id = EZUSB_IIDX_MSG_NODE_16SEG,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_16seg_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_16seg_read_packet,
-    .write_packet = ezusb_iidx_emu_node_16seg_write_packet};
-
 /* Used on 9th to DistorteD */
 const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v1 = {
     .node_id = EZUSB_IIDX_MSG_NODE_FPGA_V1,
diff --git a/src/main/ezusb-iidx-emu/nodes.h b/src/main/ezusb-iidx-emu/nodes.h
index 74a7534..9bd1ffb 100644
--- a/src/main/ezusb-iidx-emu/nodes.h
+++ b/src/main/ezusb-iidx-emu/nodes.h
@@ -3,7 +3,6 @@
 
 #include "ezusb-emu/node.h"
 
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v1;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v2;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_serial;
diff --git a/src/main/ezusb2-iidx-emu/Module.mk b/src/main/ezusb2-iidx-emu/Module.mk
index 344bc56..cd15248 100644
--- a/src/main/ezusb2-iidx-emu/Module.mk
+++ b/src/main/ezusb2-iidx-emu/Module.mk
@@ -2,6 +2,7 @@ libs            += ezusb2-iidx-emu
 
 libs_ezusb2-iidx-emu      := \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
 
 src_ezusb2-iidx-emu     := \
     msg.c \
diff --git a/src/main/ezusb2-iidx-emu/msg.c b/src/main/ezusb2-iidx-emu/msg.c
index 20aac23..a1d4be6 100644
--- a/src/main/ezusb2-iidx-emu/msg.c
+++ b/src/main/ezusb2-iidx-emu/msg.c
@@ -10,9 +10,7 @@
 
 #include "ezusb-emu/msg.h"
 #include "ezusb-emu/nodes.h"
-
-#include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/nodes.h"
+#include "ezusb-iidx-16seg-emu/nodes.h"
 
 #include "ezusb2-iidx/msg.h"
 
diff --git a/src/main/iidxhook1/Module.mk b/src/main/iidxhook1/Module.mk
index 952e9d0..1606f6d 100644
--- a/src/main/iidxhook1/Module.mk
+++ b/src/main/iidxhook1/Module.mk
@@ -7,6 +7,7 @@ ldflags_iidxhook1   := \
 libs_iidxhook1      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb-iidx-emu \
     security \
     eamio \
diff --git a/src/main/iidxhook2/Module.mk b/src/main/iidxhook2/Module.mk
index aa91d25..c9fd438 100644
--- a/src/main/iidxhook2/Module.mk
+++ b/src/main/iidxhook2/Module.mk
@@ -7,6 +7,7 @@ ldflags_iidxhook2   := \
 libs_iidxhook2      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb-iidx-emu \
     security \
     eamio \
diff --git a/src/main/iidxhook3/Module.mk b/src/main/iidxhook3/Module.mk
index 246f4ee..e328bec 100644
--- a/src/main/iidxhook3/Module.mk
+++ b/src/main/iidxhook3/Module.mk
@@ -7,6 +7,7 @@ ldflags_iidxhook3   := \
 libs_iidxhook3      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \
diff --git a/src/main/iidxhook4-cn/Module.mk b/src/main/iidxhook4-cn/Module.mk
index 31863fd..0f7bcee 100644
--- a/src/main/iidxhook4-cn/Module.mk
+++ b/src/main/iidxhook4-cn/Module.mk
@@ -9,11 +9,10 @@ deplibs_iidxhook4-cn   := \
 
 libs_iidxhook4-cn      := \
     iidxhook-util \
-    eamio \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
-    ezusb-iidx-emu \
     security \
     hook \
     hooklib \
diff --git a/src/main/iidxhook4/Module.mk b/src/main/iidxhook4/Module.mk
index 513f1e3..40f40b0 100644
--- a/src/main/iidxhook4/Module.mk
+++ b/src/main/iidxhook4/Module.mk
@@ -9,6 +9,7 @@ deplibs_iidxhook4   := \
 libs_iidxhook4      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \
diff --git a/src/main/iidxhook5-cn/Module.mk b/src/main/iidxhook5-cn/Module.mk
index 11933ae..feea3d4 100644
--- a/src/main/iidxhook5-cn/Module.mk
+++ b/src/main/iidxhook5-cn/Module.mk
@@ -9,11 +9,10 @@ deplibs_iidxhook5-cn   := \
 
 libs_iidxhook5-cn      := \
     iidxhook-util \
-    eamio \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
-    ezusb-iidx-emu \
     security \
     hook \
     hooklib \
diff --git a/src/main/iidxhook5/Module.mk b/src/main/iidxhook5/Module.mk
index 4cf08c5..f41c0b3 100644
--- a/src/main/iidxhook5/Module.mk
+++ b/src/main/iidxhook5/Module.mk
@@ -9,6 +9,7 @@ deplibs_iidxhook5   := \
 libs_iidxhook5      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \
diff --git a/src/main/iidxhook6/Module.mk b/src/main/iidxhook6/Module.mk
index 97e6121..8ef02e7 100644
--- a/src/main/iidxhook6/Module.mk
+++ b/src/main/iidxhook6/Module.mk
@@ -9,6 +9,7 @@ deplibs_iidxhook6   := \
 libs_iidxhook6      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \
diff --git a/src/main/iidxhook7/Module.mk b/src/main/iidxhook7/Module.mk
index 5eb4a4b..db61d88 100644
--- a/src/main/iidxhook7/Module.mk
+++ b/src/main/iidxhook7/Module.mk
@@ -10,6 +10,7 @@ libs_iidxhook7      := \
     iidxhook-util \
     cconfig \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \