diff --git a/testing/AbsoluteMouseReport.cpp b/testing/AbsoluteMouseReport.cpp
index 863dd20b..38a8b995 100644
--- a/testing/AbsoluteMouseReport.cpp
+++ b/testing/AbsoluteMouseReport.cpp
@@ -19,8 +19,8 @@
 #include <cstring>  // for memcpy
 #include <vector>   // for vector
 
-#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
-#include "kaleidoscope/Runtime.h"  // for Runtime, Runtime_
+#include "kaleidoscope/Runtime.h"                                 // for Runtime, Runtime_
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"  // for MOUSE_LEFT, MOUSE_MIDDLE
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/AbsoluteMouseReport.h b/testing/AbsoluteMouseReport.h
index 81c8fa13..f28a43d6 100644
--- a/testing/AbsoluteMouseReport.h
+++ b/testing/AbsoluteMouseReport.h
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include <cstdint>  // for uint16_t, uint32_t, uint8_t, int8_t
+#include <cstdint>  // for uint16_t
 #include <vector>   // for vector
 
-#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
-#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"  // for HID_Mous...
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"                 // for HID_REPO...
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/ConsumerControlReport.h b/testing/ConsumerControlReport.h
index 4a93a674..df9f7564 100644
--- a/testing/ConsumerControlReport.h
+++ b/testing/ConsumerControlReport.h
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include <cstdint>  // for uint32_t, uint16_t, uint8_t
+#include <cstdint>  // for uint32_t
 #include <vector>   // for vector
 
-#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
-#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"                 // for HID_REPO...
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"  // for HID_Cons...
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/ExpectedMouseReport.cpp b/testing/ExpectedMouseReport.cpp
index 5e542b23..b81f8d01 100644
--- a/testing/ExpectedMouseReport.cpp
+++ b/testing/ExpectedMouseReport.cpp
@@ -16,8 +16,8 @@
 
 #include "testing/ExpectedMouseReport.h"
 
-#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"    // for (anonymous union)::(anonymous)
-#include "testing/MouseReport.h"  // for MouseReport::ReportData
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"  // for (anonymous union):...
+#include "testing/MouseReport.h"                                       // for MouseReport::Repor...
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/HIDState.cpp b/testing/HIDState.cpp
index 4aac3448..e2dd1c75 100644
--- a/testing/HIDState.cpp
+++ b/testing/HIDState.cpp
@@ -21,8 +21,8 @@
 #include <utility>  // IWYU pragma: keep
 #include <vector>   // for vector
 
-#include "HID-Settings.h"      // for HID_REPORTID_CONSUMERCONTROL, HID_REPORTID_GAMEPAD, HID_RE...
-#include "testing/iostream.h"  // for operator<<, char_traits, cout, ostream, basic_ostream
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"  // for HID_REPORTID_CONSUMERCO...
+#include "testing/iostream.h"                                     // for operator<<, char_traits
 
 #define LOG(x) std::cout
 
diff --git a/testing/KeyboardReport.h b/testing/KeyboardReport.h
index 52a4f782..97fa4330 100644
--- a/testing/KeyboardReport.h
+++ b/testing/KeyboardReport.h
@@ -19,8 +19,8 @@
 #include <cstdint>  // for uint8_t, uint32_t
 #include <vector>   // for vector
 
-#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
-#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"          // for HID_REPORTID_NK...
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"  // for HID_KeyboardRep...
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/MouseReport.h b/testing/MouseReport.h
index ae84d460..4a27a122 100644
--- a/testing/MouseReport.h
+++ b/testing/MouseReport.h
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include <cstdint>  // for uint8_t, int8_t, uint32_t
+#include <cstdint>  // for uint8_t, int8_t
 
 #include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"       // for HID_REPORTID_MOUSE
-#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"       // for MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_NEXT, MOUSE_PREV, MOUSE_R...
-#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"  // for HID_MouseReport_Data_t
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"       // for MOUSE_LEFT, MOUSE_...
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"  // for HID_MouseReport_Da...
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/SystemControlReport.h b/testing/SystemControlReport.h
index 9fa7989b..f3ce2c72 100644
--- a/testing/SystemControlReport.h
+++ b/testing/SystemControlReport.h
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include <cstdint>  // for uint8_t, uint32_t
+#include <cstdint>  // for uint8_t
 #include <vector>   // for vector
 
-#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"               // for HID_REPORTID_SYSTEMCONTROL
-#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"  // for HID_SystemControlReport_Data_t
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"               // for HID_REPORT...
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"  // for HID_System...
 
 namespace kaleidoscope {
 namespace testing {
diff --git a/testing/VirtualDeviceTest.cpp b/testing/VirtualDeviceTest.cpp
index b0c6717f..3848c1a9 100644
--- a/testing/VirtualDeviceTest.cpp
+++ b/testing/VirtualDeviceTest.cpp
@@ -22,13 +22,13 @@
 #include <bitset>  // for bitset
 #include <vector>  // for vector
 
-#include "kaleidoscope/Runtime.h"    // for Runtime, Runtime_
+#include "kaleidoscope/Runtime.h"                                      // for Runtime, Runtime_
 #include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"  // for HIDReportObserver
-#include "testing/HIDState.h"        // for HIDState, HIDStateBuilder
-#include "testing/KeyboardReport.h"  // for KeyboardReport
-#include "testing/MouseReport.h"     // for MouseReport
-#include "testing/gtest.h"           // for Message, TestPartResult, EXPECT_EQ, ElementsAreArray
-#include "testing/iostream.h"        // for operator<<, basic_ostream, char_traits, string, cerr
+#include "testing/HIDState.h"                                          // for HIDState, HIDState...
+#include "testing/KeyboardReport.h"                                    // for KeyboardReport
+#include "testing/MouseReport.h"                                       // for MouseReport
+#include "testing/gtest.h"                                             // for Message, TestPartR...
+#include "testing/iostream.h"                                          // for operator<<, char_t...
 
 namespace kaleidoscope {
 namespace testing {