diff --git a/hal/src/dev/native/cpp/main.cpp b/hal/src/dev/native/cpp/main.cpp
index 348a3ef4db..7d124cad0b 100644
--- a/hal/src/dev/native/cpp/main.cpp
+++ b/hal/src/dev/native/cpp/main.cpp
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/util/print.hpp"
 
 int main() {
diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp
index a113725e30..86f9dafa0d 100644
--- a/hal/src/main/native/cpp/jni/HAL.cpp
+++ b/hal/src/main/native/cpp/jni/HAL.cpp
@@ -2,10 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/hal/HAL.h"
-
 #include <jni.h>
 
+#include "wpi/hal/HALBase.h"
+
 #ifdef __FRC_SYSTEMCORE__
 #include <signal.h>
 #endif
diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp
index ca9eb389c8..9c51bbc90c 100644
--- a/hal/src/main/native/cpp/jni/HALUtil.cpp
+++ b/hal/src/main/native/cpp/jni/HALUtil.cpp
@@ -18,7 +18,8 @@
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/Errors.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Value.h"
 #include "wpi/util/jni_util.hpp"
 
 using namespace wpi::util::java;
diff --git a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp
index 2aab0b293d..b7f6eed5a8 100644
--- a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp
@@ -11,7 +11,7 @@
 #include "OpModeOptionsCallbackStore.hpp"
 #include "SimDeviceDataJNI.hpp"
 #include "org_wpilib_hardware_hal_simulation_SimulatorJNI.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hal/handles/HandlesInternal.hpp"
 #include "wpi/hal/simulation/MockHooks.h"
 #include "wpi/util/jni_util.hpp"
diff --git a/hal/src/main/native/include/wpi/hal/HAL.h b/hal/src/main/native/include/wpi/hal/HAL.h
deleted file mode 100644
index 39b1a22b87..0000000000
--- a/hal/src/main/native/include/wpi/hal/HAL.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-#pragma once
-
-#include <stdint.h>
-
-#include "wpi/hal/AnalogInput.h"
-#include "wpi/hal/CAN.h"
-#include "wpi/hal/CANAPI.h"
-#include "wpi/hal/CTREPCM.h"
-#include "wpi/hal/Constants.h"
-#include "wpi/hal/Counter.h"
-#include "wpi/hal/DIO.h"
-#include "wpi/hal/DriverStation.h"
-#include "wpi/hal/Encoder.h"
-#include "wpi/hal/Errors.h"
-#include "wpi/hal/HALBase.h"
-#include "wpi/hal/I2C.h"
-#include "wpi/hal/Main.h"
-#include "wpi/hal/Notifier.h"
-#include "wpi/hal/PWM.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/Power.h"
-#include "wpi/hal/SerialPort.h"
-#include "wpi/hal/SimDevice.h"
-#include "wpi/hal/Threads.h"
-#include "wpi/hal/Types.h"
-#include "wpi/hal/UsageReporting.h"
-#include "wpi/hal/Value.h"
diff --git a/hal/src/main/native/sim/HAL.cpp b/hal/src/main/native/sim/HAL.cpp
index 7dcfa25c43..be1aab8599 100644
--- a/hal/src/main/native/sim/HAL.cpp
+++ b/hal/src/main/native/sim/HAL.cpp
@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/hal/HAL.h"
-
 #include <cstdio>
 #include <cstring>
 #include <utility>
 #include <vector>
 
+#include "wpi/hal/HALBase.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #pragma comment(lib, "Winmm.lib")
@@ -24,6 +24,7 @@ NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution,
 #include "HALInitializer.hpp"
 #include "MockHooksInternal.hpp"
 #include "mockdata/RoboRioDataInternal.hpp"
+#include "wpi/hal/CAN.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Extensions.h"
 #include "wpi/hal/simulation/DriverStationData.h"
diff --git a/hal/src/main/native/systemcore/HAL.cpp b/hal/src/main/native/systemcore/HAL.cpp
index 9e4d3347b4..512113b732 100644
--- a/hal/src/main/native/systemcore/HAL.cpp
+++ b/hal/src/main/native/systemcore/HAL.cpp
@@ -2,8 +2,6 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/hal/HAL.h"
-
 #include <dlfcn.h>
 #include <signal.h>  // linux for kill
 #include <sys/prctl.h>
@@ -17,7 +15,9 @@
 #include "HALInitializer.hpp"
 #include "HALInternal.hpp"
 #include "SystemServerInternal.hpp"
+#include "wpi/hal/CAN.h"
 #include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/timestamp.hpp"
diff --git a/hal/src/test/native/cpp/HALTest.cpp b/hal/src/test/native/cpp/HALTest.cpp
index 011830dcbf..2557ea2f74 100644
--- a/hal/src/test/native/cpp/HALTest.cpp
+++ b/hal/src/test/native/cpp/HALTest.cpp
@@ -2,10 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/hal/HAL.h"
-
 #include <gtest/gtest.h>
 
+#include "wpi/hal/HALBase.h"
+
 namespace wpi::hal {
 TEST(HALTest, RuntimeType) {
   EXPECT_EQ(HAL_RuntimeType::HAL_Runtime_Simulation, HAL_GetRuntimeType());
diff --git a/hal/src/test/native/cpp/main.cpp b/hal/src/test/native/cpp/main.cpp
index 8b833f274b..52b60dc4ef 100644
--- a/hal/src/test/native/cpp/main.cpp
+++ b/hal/src/test/native/cpp/main.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 
 int main(int argc, char** argv) {
   HAL_Initialize(500, 0);
diff --git a/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp b/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp
index ccc5fc1a65..01bfcb4f17 100644
--- a/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp
@@ -9,7 +9,8 @@
 #include <gtest/gtest.h>
 
 #include "wpi/hal/AnalogInput.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hal/handles/HandlesInternal.hpp"
 
 namespace wpi::hal {
diff --git a/hal/src/test/native/cpp/mockdata/DIODataTest.cpp b/hal/src/test/native/cpp/mockdata/DIODataTest.cpp
index 542e140179..cad7429412 100644
--- a/hal/src/test/native/cpp/mockdata/DIODataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/DIODataTest.cpp
@@ -9,7 +9,8 @@
 #include <gtest/gtest.h>
 
 #include "wpi/hal/DIO.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hal/handles/HandlesInternal.hpp"
 
 namespace wpi::hal {
diff --git a/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp b/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
index 918ee65b0d..978abbaca7 100644
--- a/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
@@ -5,11 +5,10 @@
 #include "wpi/hal/simulation/DriverStationData.h"
 
 #include <cstring>
-#include <string>
 
 #include <gtest/gtest.h>
 
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/DriverStation.h"
 #include "wpi/util/StringExtras.hpp"
 
 namespace wpi::hal {
diff --git a/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp b/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp
index 0a29359797..695236157e 100644
--- a/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp
@@ -7,7 +7,8 @@
 #include <gtest/gtest.h>
 
 #include "wpi/hal/CTREPCM.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hal/handles/HandlesInternal.hpp"
 #include "wpi/hal/simulation/CTREPCMData.h"
 
diff --git a/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp b/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp
index d5182dcb7a..14d234e8e0 100644
--- a/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp
@@ -8,7 +8,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/hal/PWM.h"
 #include "wpi/hal/handles/HandlesInternal.hpp"
 
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp
index 04aae13c6c..778b20fe3c 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp
@@ -9,7 +9,6 @@
 #include <string_view>
 
 #include "wpi/hal/Extensions.h"
-#include "wpi/hal/HAL.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/MockHooks.h"
 #include "wpi/util/raw_ostream.hpp"
diff --git a/wpilibc/src/test/native/c/test.c b/wpilibc/src/test/native/c/test.c
index e1a728923b..756c04769e 100644
--- a/wpilibc/src/test/native/c/test.c
+++ b/wpilibc/src/test/native/c/test.c
@@ -3,5 +3,5 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include "wpi/cs/cscore_c.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/nt/ntcore.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c b/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c
index 72a4034dbb..6f6e6fb62f 100644
--- a/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c
+++ b/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c
@@ -15,8 +15,11 @@ that want even more control over what code runs on their robot.
 
 #include <stdio.h>
 
+#include "wpi/hal/DIO.h"
+#include "wpi/hal/DriverStation.h"
 #include "wpi/hal/DriverStationTypes.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/PWM.h"
 
 HAL_RobotMode getDSMode(void) {
   // Get Robot State