The simulator hadn't been updated for these changes

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"

testing/AbsoluteMouseReport.cpp

@@ -21,7 +21,8 @@
 
 #include <cstring>
 
-#include "MouseButtons.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
+
 
 namespace kaleidoscope {
 namespace testing {

testing/AbsoluteMouseReport.h

@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "DeviceAPIs/AbsoluteMouseAPI.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
-#include "HID-Settings.h"
 
 namespace kaleidoscope {
 namespace testing {

testing/ConsumerControlReport.h

@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
-#include "MultiReport/ConsumerControl.h"
 
 namespace kaleidoscope {
 namespace testing {

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.

testing/KeyboardReport.h

@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
-#include "MultiReport/Keyboard.h"
 
 namespace kaleidoscope {
 namespace testing {

testing/SystemControlReport.h

@@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
-#include "MultiReport/SystemControl.h"
 
 namespace kaleidoscope {
 namespace testing {

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 \