diff --git a/wpilibc/wpilibC++IntegrationTests/include/TestBench.h b/wpilibc/wpilibC++IntegrationTests/include/TestBench.h
index a09f887a03..bd3d2881ac 100644
--- a/wpilibc/wpilibC++IntegrationTests/include/TestBench.h
+++ b/wpilibc/wpilibC++IntegrationTests/include/TestBench.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "WPILib.h"
+#include <cstdint>
 
 class TestBench {
  public:
diff --git a/wpilibc/wpilibC++IntegrationTests/include/command/MockCommand.h b/wpilibc/wpilibC++IntegrationTests/include/command/MockCommand.h
index 60f428f206..e52a6fce0a 100644
--- a/wpilibc/wpilibC++IntegrationTests/include/command/MockCommand.h
+++ b/wpilibc/wpilibC++IntegrationTests/include/command/MockCommand.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "WPILib.h"
+#include <Commands/Command.h>
 
 class MockCommand : public Command {
  private:
diff --git a/wpilibc/wpilibC++IntegrationTests/src/AnalogLoopTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/AnalogLoopTest.cpp
index 4302b3829c..e8bc1e5810 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/AnalogLoopTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/AnalogLoopTest.cpp
@@ -5,7 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <AnalogInput.h>
+#include <AnalogOutput.h>
+#include <AnalogTrigger.h>
+#include <Counter.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/AnalogPotentiometerTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/AnalogPotentiometerTest.cpp
index af3d9b85b4..c812029afb 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/AnalogPotentiometerTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/AnalogPotentiometerTest.cpp
@@ -5,8 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
-#include "AnalogOutput.h"
+#include <AnalogOutput.h>
+#include <AnalogPotentiometer.h>
+#include <Timer.h>
 #include "TestBench.h"
 #include "gtest/gtest.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp
index 0850e307ca..d6563e0607 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/BuiltInAccelerometerTest.cpp
@@ -5,7 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <BuiltInAccelerometer.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 
 static constexpr double kAccelerationTolerance = 0.1;
diff --git a/wpilibc/wpilibC++IntegrationTests/src/CANJaguarTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/CANJaguarTest.cpp
index 7d600fcce6..f1b8e5d17e 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/CANJaguarTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/CANJaguarTest.cpp
@@ -5,7 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <AnalogOutput.h>
+#include <DigitalOutput.h>
+#include <CANJaguar.h>
+#include <Relay.h>
+#include <Timer.h>
+#include <WPIErrors.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/CANTalonTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/CANTalonTest.cpp
index 03f7ad9319..2584f3f4d6 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/CANTalonTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/CANTalonTest.cpp
@@ -4,7 +4,8 @@
 /* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib.  */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <CANTalon.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/ConditionVariableTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/ConditionVariableTest.cpp
index 09e2f9a500..43e792adae 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/ConditionVariableTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/ConditionVariableTest.cpp
@@ -1,14 +1,14 @@
-#include "WPILib.h"
 #include "TestBench.h"
 
 #include "HAL/cpp/priority_condition_variable.h"
 #include "HAL/cpp/priority_mutex.h"
 
 #include "gtest/gtest.h"
+#include <atomic>
+#include <chrono>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-#include <chrono>
 
 namespace wpilib {
 namespace testing {
diff --git a/wpilibc/wpilibC++IntegrationTests/src/CounterTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/CounterTest.cpp
index b268df73db..12a4226d87 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/CounterTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/CounterTest.cpp
@@ -5,7 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Counter.h>
+#include <Jaguar.h>
+#include <Talon.h>
+#include <Timer.h>
+#include <Victor.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/DIOLoopTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/DIOLoopTest.cpp
index 8075ed7997..c13d1450f5 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/DIOLoopTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/DIOLoopTest.cpp
@@ -5,7 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Counter.h>
+#include <DigitalInput.h>
+#include <DigitalOutput.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/FakeEncoderTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/FakeEncoderTest.cpp
index fab83643c1..3a5dbbbae2 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/FakeEncoderTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/FakeEncoderTest.cpp
@@ -6,7 +6,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <AnalogOutput.h>
+#include <AnalogTrigger.h>
+#include <DigitalOutput.h>
+#include <Encoder.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/MotorEncoderTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/MotorEncoderTest.cpp
index 1175c2dc4b..47f0ab9463 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/MotorEncoderTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/MotorEncoderTest.cpp
@@ -5,7 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Encoder.h>
+#include <Jaguar.h>
+#include <PIDController.h>
+#include <Talon.h>
+#include <Timer.h>
+#include <Victor.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/MotorInvertingTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/MotorInvertingTest.cpp
index 7c4da8aa20..17942995ac 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/MotorInvertingTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/MotorInvertingTest.cpp
@@ -5,7 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Encoder.h>
+#include <Jaguar.h>
+#include <Talon.h>
+#include <Timer.h>
+#include <Victor.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/MutexTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/MutexTest.cpp
index e02c8b37fa..ad3ecbbbb5 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/MutexTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/MutexTest.cpp
@@ -1,11 +1,10 @@
-#include "WPILib.h"
+#include "HAL/cpp/priority_mutex.h"
 #include "TestBench.h"
 
 #include "gtest/gtest.h"
 #include <atomic>
-#include <thread>
-#include "HAL/cpp/priority_mutex.h"
 #include <condition_variable>
+#include <thread>
 
 namespace wpilib {
 namespace testing {
diff --git a/wpilibc/wpilibC++IntegrationTests/src/NotifierTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/NotifierTest.cpp
index 18f69a63db..10e0504b17 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/NotifierTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/NotifierTest.cpp
@@ -5,7 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Notifier.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/PCMTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/PCMTest.cpp
index 38f8d76b61..cbebddea08 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/PCMTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/PCMTest.cpp
@@ -5,7 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <AnalogInput.h>
+#include <Compressor.h>
+#include <DigitalInput.h>
+#include <DigitalOutput.h>
+#include <DoubleSolenoid.h>
+#include <Solenoid.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/PowerDistributionPanelTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/PowerDistributionPanelTest.cpp
index c099323448..7dc31fd5cc 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/PowerDistributionPanelTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/PowerDistributionPanelTest.cpp
@@ -5,7 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Jaguar.h>
+#include <PowerDistributionPanel.h>
+#include <Talon.h>
+#include <Timer.h>
+#include <Victor.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/PreferencesTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/PreferencesTest.cpp
index 796f45a0ec..925f333d4e 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/PreferencesTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/PreferencesTest.cpp
@@ -5,7 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Preferences.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include <cstdio>
 #include <fstream>
diff --git a/wpilibc/wpilibC++IntegrationTests/src/RelayTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/RelayTest.cpp
index ee6133d5ea..c919297897 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/RelayTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/RelayTest.cpp
@@ -5,7 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <DigitalInput.h>
+#include <Relay.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 #include "Relay.h"
diff --git a/wpilibc/wpilibC++IntegrationTests/src/TestEnvironment.cpp b/wpilibc/wpilibC++IntegrationTests/src/TestEnvironment.cpp
index 6163a050e8..b727e3f295 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/TestEnvironment.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/TestEnvironment.cpp
@@ -5,8 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include <DriverStation.h>
+#include <LiveWindow/LiveWindow.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
-#include "WPILib.h"
 
 class TestEnvironment : public testing::Environment {
   bool m_alreadySetUp = false;
diff --git a/wpilibc/wpilibC++IntegrationTests/src/TiltPanCameraTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/TiltPanCameraTest.cpp
index 078044332c..9eacae5475 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/TiltPanCameraTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/TiltPanCameraTest.cpp
@@ -5,7 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <ADXL345_SPI.h>
+#include <Gyro.h>
+#include <Servo.h>
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/TimerTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/TimerTest.cpp
index 8a4c0a7d10..faa6ada180 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/TimerTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/TimerTest.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Timer.h>
 #include "gtest/gtest.h"
 #include "TestBench.h"
 
diff --git a/wpilibc/wpilibC++IntegrationTests/src/command/CommandTest.cpp b/wpilibc/wpilibC++IntegrationTests/src/command/CommandTest.cpp
index 920b97ac71..15dd774e7b 100644
--- a/wpilibc/wpilibC++IntegrationTests/src/command/CommandTest.cpp
+++ b/wpilibc/wpilibC++IntegrationTests/src/command/CommandTest.cpp
@@ -5,11 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "WPILib.h"
+#include <Commands/CommandGroup.h>
+#include <Commands/Scheduler.h>
+#include <Commands/Subsystem.h>
+#include <DriverStation.h>
+#include <RobotState.h>
+#include <Timer.h>
 #include "command/MockCommand.h"
 #include "gtest/gtest.h"
-#include "RobotState.h"
-#include "DriverStation.h"
 
 class CommandTest : public testing::Test {
  protected: