diff --git a/.styleguide b/.styleguide
index 44ae5fb548..a18f24ca9d 100644
--- a/.styleguide
+++ b/.styleguide
@@ -31,6 +31,7 @@ modifiableFileExclude {
 includeOtherLibs {
   ^HAL/
   ^llvm/
+  ^networktables/
   ^opencv2/
   ^support/
 }
diff --git a/wpilibc/src/main/native/cpp/Buttons/NetworkButton.cpp b/wpilibc/src/main/native/cpp/Buttons/NetworkButton.cpp
index ac66f9a856..0861cbd193 100644
--- a/wpilibc/src/main/native/cpp/Buttons/NetworkButton.cpp
+++ b/wpilibc/src/main/native/cpp/Buttons/NetworkButton.cpp
@@ -7,8 +7,8 @@
 
 #include "Buttons/NetworkButton.h"
 
-#include "networktables/NetworkTable.h"
-#include "networktables/NetworkTableInstance.h"
+#include <networktables/NetworkTable.h>
+#include <networktables/NetworkTableInstance.h>
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/CameraServer.cpp b/wpilibc/src/main/native/cpp/CameraServer.cpp
index 448ee42353..a8e0c42214 100644
--- a/wpilibc/src/main/native/cpp/CameraServer.cpp
+++ b/wpilibc/src/main/native/cpp/CameraServer.cpp
@@ -10,10 +10,10 @@
 #include <HAL/HAL.h>
 #include <llvm/SmallString.h>
 #include <llvm/raw_ostream.h>
+#include <networktables/NetworkTableInstance.h>
 
 #include "Utility.h"
 #include "WPIErrors.h"
-#include "networktables/NetworkTableInstance.h"
 #include "ntcore_cpp.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp b/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp
index 1a9aea003a..38c7954bf8 100644
--- a/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp
+++ b/wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp
@@ -12,13 +12,13 @@
 #include <llvm/DenseMap.h>
 #include <llvm/SmallString.h>
 #include <llvm/raw_ostream.h>
+#include <networktables/NetworkTable.h>
+#include <networktables/NetworkTableEntry.h>
+#include <networktables/NetworkTableInstance.h>
 #include <support/mutex.h>
 
 #include "Commands/Scheduler.h"
 #include "SmartDashboard/SendableBuilderImpl.h"
-#include "networktables/NetworkTable.h"
-#include "networktables/NetworkTableEntry.h"
-#include "networktables/NetworkTableInstance.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/Preferences.cpp b/wpilibc/src/main/native/cpp/Preferences.cpp
index 09fce71acc..fd9704d700 100644
--- a/wpilibc/src/main/native/cpp/Preferences.cpp
+++ b/wpilibc/src/main/native/cpp/Preferences.cpp
@@ -11,9 +11,9 @@
 
 #include <HAL/HAL.h>
 #include <llvm/StringRef.h>
+#include <networktables/NetworkTableInstance.h>
 
 #include "WPIErrors.h"
-#include "networktables/NetworkTableInstance.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/RobotBase.cpp b/wpilibc/src/main/native/cpp/RobotBase.cpp
index 9ecfcedcb9..2c799845eb 100644
--- a/wpilibc/src/main/native/cpp/RobotBase.cpp
+++ b/wpilibc/src/main/native/cpp/RobotBase.cpp
@@ -10,6 +10,7 @@
 #include <cstdio>
 
 #include <HAL/HAL.h>
+#include <networktables/NetworkTableInstance.h>
 
 #include "DriverStation.h"
 #include "HLUsageReporting.h"
@@ -19,7 +20,6 @@
 #include "SmartDashboard/SmartDashboard.h"
 #include "Utility.h"
 #include "WPILibVersion.h"
-#include "networktables/NetworkTableInstance.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SampleRobot.cpp b/wpilibc/src/main/native/cpp/SampleRobot.cpp
index 19c06481c8..e15a639a02 100644
--- a/wpilibc/src/main/native/cpp/SampleRobot.cpp
+++ b/wpilibc/src/main/native/cpp/SampleRobot.cpp
@@ -8,11 +8,11 @@
 #include "SampleRobot.h"
 
 #include <llvm/raw_ostream.h>
+#include <networktables/NetworkTable.h>
 
 #include "DriverStation.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
-#include "networktables/NetworkTable.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp b/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
index 18e8b15a62..e45f4c8e7c 100644
--- a/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
+++ b/wpilibc/src/main/native/cpp/SmartDashboard/SmartDashboard.cpp
@@ -8,14 +8,14 @@
 #include "SmartDashboard/SmartDashboard.h"
 
 #include <llvm/StringMap.h>
+#include <networktables/NetworkTable.h>
+#include <networktables/NetworkTableInstance.h>
 #include <support/mutex.h>
 
 #include "HLUsageReporting.h"
 #include "SmartDashboard/Sendable.h"
 #include "SmartDashboard/SendableBuilderImpl.h"
 #include "WPIErrors.h"
-#include "networktables/NetworkTable.h"
-#include "networktables/NetworkTableInstance.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/include/Buttons/NetworkButton.h b/wpilibc/src/main/native/include/Buttons/NetworkButton.h
index 54fef89df1..0d850a0fe8 100644
--- a/wpilibc/src/main/native/include/Buttons/NetworkButton.h
+++ b/wpilibc/src/main/native/include/Buttons/NetworkButton.h
@@ -10,10 +10,10 @@
 #include <memory>
 
 #include <llvm/Twine.h>
+#include <networktables/NetworkTable.h>
+#include <networktables/NetworkTableEntry.h>
 
 #include "Buttons/Button.h"
-#include "networktables/NetworkTable.h"
-#include "networktables/NetworkTableEntry.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/CameraServer.h b/wpilibc/src/main/native/include/CameraServer.h
index bad39d8ee8..ef25de55c2 100644
--- a/wpilibc/src/main/native/include/CameraServer.h
+++ b/wpilibc/src/main/native/include/CameraServer.h
@@ -17,11 +17,11 @@
 #include <llvm/DenseMap.h>
 #include <llvm/StringMap.h>
 #include <llvm/StringRef.h>
+#include <networktables/NetworkTable.h>
 #include <support/mutex.h>
 
 #include "ErrorBase.h"
 #include "cscore.h"
-#include "networktables/NetworkTable.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Commands/Scheduler.h b/wpilibc/src/main/native/include/Commands/Scheduler.h
index 17c4c5b101..9b2a2aeea1 100644
--- a/wpilibc/src/main/native/include/Commands/Scheduler.h
+++ b/wpilibc/src/main/native/include/Commands/Scheduler.h
@@ -12,12 +12,12 @@
 #include <string>
 #include <vector>
 
+#include <networktables/NetworkTableEntry.h>
 #include <support/mutex.h>
 
 #include "Commands/Command.h"
 #include "ErrorBase.h"
 #include "SmartDashboard/SendableBase.h"
-#include "networktables/NetworkTableEntry.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/Preferences.h b/wpilibc/src/main/native/include/Preferences.h
index 048e0e6629..e12d6c07b8 100644
--- a/wpilibc/src/main/native/include/Preferences.h
+++ b/wpilibc/src/main/native/include/Preferences.h
@@ -13,8 +13,9 @@
 #include <string>
 #include <vector>
 
+#include <networktables/NetworkTable.h>
+
 #include "ErrorBase.h"
-#include "networktables/NetworkTable.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableBuilder.h b/wpilibc/src/main/native/include/SmartDashboard/SendableBuilder.h
index 8e76296d3b..5aade6b131 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableBuilder.h
+++ b/wpilibc/src/main/native/include/SmartDashboard/SendableBuilder.h
@@ -15,9 +15,8 @@
 #include <llvm/ArrayRef.h>
 #include <llvm/SmallVector.h>
 #include <llvm/Twine.h>
-
-#include "networktables/NetworkTableEntry.h"
-#include "networktables/NetworkTableValue.h"
+#include <networktables/NetworkTableEntry.h>
+#include <networktables/NetworkTableValue.h>
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h b/wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h
index 5929262225..8dde86b991 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h
+++ b/wpilibc/src/main/native/include/SmartDashboard/SendableBuilderImpl.h
@@ -16,11 +16,11 @@
 #include <llvm/ArrayRef.h>
 #include <llvm/SmallVector.h>
 #include <llvm/Twine.h>
+#include <networktables/NetworkTable.h>
+#include <networktables/NetworkTableEntry.h>
+#include <networktables/NetworkTableValue.h>
 
 #include "SendableBuilder.h"
-#include "networktables/NetworkTable.h"
-#include "networktables/NetworkTableEntry.h"
-#include "networktables/NetworkTableValue.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SendableChooserBase.h b/wpilibc/src/main/native/include/SmartDashboard/SendableChooserBase.h
index e62f410212..7da57ca319 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SendableChooserBase.h
+++ b/wpilibc/src/main/native/include/SmartDashboard/SendableChooserBase.h
@@ -9,8 +9,9 @@
 
 #include <string>
 
+#include <networktables/NetworkTableEntry.h>
+
 #include "SmartDashboard/SendableBase.h"
-#include "networktables/NetworkTableEntry.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h b/wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h
index bde423206d..a03dedd302 100644
--- a/wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h
+++ b/wpilibc/src/main/native/include/SmartDashboard/SmartDashboard.h
@@ -11,8 +11,9 @@
 #include <string>
 #include <vector>
 
+#include <networktables/NetworkTableValue.h>
+
 #include "SensorBase.h"
-#include "networktables/NetworkTableValue.h"
 
 namespace frc {
 
diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp
index 1cfeb52546..1bf2c317cf 100644
--- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp
+++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/PreferencesTest.cpp
@@ -10,9 +10,10 @@
 #include <cstdio>
 #include <fstream>
 
+#include <networktables/NetworkTableInstance.h>
+
 #include "Timer.h"
 #include "gtest/gtest.h"
-#include "networktables/NetworkTableInstance.h"
 #include "ntcore.h"
 
 using namespace frc;