diff --git a/hal/.styleguide b/hal/.styleguide
index b6fabcc27f..2386f43145 100644
--- a/hal/.styleguide
+++ b/hal/.styleguide
@@ -37,6 +37,8 @@ includeOtherLibs {
   ^gtest/
   ^i2clib/
   ^llvm/
+  ^networktables/
+  ^ntcore
   ^opencv2/
   ^spilib/
   ^support/
diff --git a/hal/src/main/native/systemcore/FRCDriverStation.cpp b/hal/src/main/native/systemcore/FRCDriverStation.cpp
index 0d3d0938d9..1cbe9baabb 100644
--- a/hal/src/main/native/systemcore/FRCDriverStation.cpp
+++ b/hal/src/main/native/systemcore/FRCDriverStation.cpp
@@ -2,12 +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 <networktables/BooleanTopic.h>
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/ProtobufTopic.h>
-#include <networktables/StringArrayTopic.h>
-#include <networktables/StringTopic.h>
-
 #include <atomic>
 #include <chrono>
 #include <cstdio>
@@ -19,6 +13,11 @@
 #include <utility>
 
 #include <fmt/format.h>
+#include <networktables/BooleanTopic.h>
+#include <networktables/NetworkTableInstance.h>
+#include <networktables/ProtobufTopic.h>
+#include <networktables/StringArrayTopic.h>
+#include <networktables/StringTopic.h>
 #include <wpi/EventVector.h>
 #include <wpi/SafeThread.h>
 #include <wpi/SmallVector.h>
diff --git a/hal/src/main/native/systemcore/SmartIo.h b/hal/src/main/native/systemcore/SmartIo.h
index 73ebbb91f8..9d9273b667 100644
--- a/hal/src/main/native/systemcore/SmartIo.h
+++ b/hal/src/main/native/systemcore/SmartIo.h
@@ -6,10 +6,11 @@
 
 #include <string>
 
+#include <networktables/IntegerTopic.h>
+
 #include "PortsInternal.h"
 #include "hal/handles/DigitalHandleResource.h"
 #include "hal/handles/HandlesInternal.h"
-#include "networktables/IntegerTopic.h"
 
 namespace hal {