diff --git a/src/kaleidoscope/device/virtual/DefaultHIDReportConsumer.cpp b/src/kaleidoscope/device/virtual/DefaultHIDReportConsumer.cpp
index 05ea9c04..2c632fad 100644
--- a/src/kaleidoscope/device/virtual/DefaultHIDReportConsumer.cpp
+++ b/src/kaleidoscope/device/virtual/DefaultHIDReportConsumer.cpp
@@ -17,7 +17,7 @@
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
 #include "DefaultHIDReportConsumer.h"
-#include "MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
 #include "Logging.h"
 
 #include "virtual_io.h"
diff --git a/testing/AbsoluteMouseReport.cpp b/testing/AbsoluteMouseReport.cpp
index 0c1303af..a01a9b38 100644
--- a/testing/AbsoluteMouseReport.cpp
+++ b/testing/AbsoluteMouseReport.cpp
@@ -21,7 +21,8 @@
 
 #include <cstring>
 
-#include "MouseButtons.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
+
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/AbsoluteMouseReport.h b/testing/AbsoluteMouseReport.h
index 71666ad8..aeea32a2 100644
--- a/testing/AbsoluteMouseReport.h
+++ b/testing/AbsoluteMouseReport.h
@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "DeviceAPIs/AbsoluteMouseAPI.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/ConsumerControlReport.h b/testing/ConsumerControlReport.h
index 61857f72..f39df84c 100644
--- a/testing/ConsumerControlReport.h
+++ b/testing/ConsumerControlReport.h
@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "HID-Settings.h"
-#include "MultiReport/ConsumerControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/HIDState.cpp b/testing/HIDState.cpp
index f9d72de8..3e89cea2 100644
--- a/testing/HIDState.cpp
+++ b/testing/HIDState.cpp
@@ -16,8 +16,6 @@
 
 #include "testing/HIDState.h"
 
-#include "HID-Settings.h"
-
 #include "testing/fix-macros.h"
 
 // TODO(epan): Add proper logging.
diff --git a/testing/KeyboardReport.h b/testing/KeyboardReport.h
index 29c41c70..b5da6918 100644
--- a/testing/KeyboardReport.h
+++ b/testing/KeyboardReport.h
@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "HID-Settings.h"
-#include "MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/SystemControlReport.h b/testing/SystemControlReport.h
index 44719abb..0f3ed53d 100644
--- a/testing/SystemControlReport.h
+++ b/testing/SystemControlReport.h
@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "HID-Settings.h"
-#include "MultiReport/SystemControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/makefiles/shared.mk b/testing/makefiles/shared.mk
index 9c4b2e32..b16bf97a 100644
--- a/testing/makefiles/shared.mk
+++ b/testing/makefiles/shared.mk
@@ -15,7 +15,6 @@ shared_includes := \
 		-I${top_dir} \
 		-I${top_dir}/src \
 		-I${arduino_platform_path}/cores/arduino \
-		-I${arduino_platform_path}/libraries/KeyboardioHID/src \
 		-I${top_dir}/testing/googletest/googlemock/include \
 		-I${top_dir}/testing/googletest/googletest/include \