diff --git a/.styleguide b/.styleguide
index d46d5ecb8f..44ae5fb548 100644
--- a/.styleguide
+++ b/.styleguide
@@ -10,13 +10,12 @@ cppSrcFileInclude {
 
 generatedFileExclude {
   gmock/
-  ni-libraries/
+  ni-libraries/include/
+  ni-libraries/lib/
   hal/src/main/native/athena/ctre/
   hal/src/main/native/athena/frccansae/
   hal/src/main/native/athena/visa/
   hal/src/main/native/include/ctre/
-  simulation/JavaGazebo/build/classes/main/gazebo/msgs/
-  wpilibj/src/athena/cpp/nivision/
   UsageReporting\.h$
 }
 
diff --git a/hal/.styleguide b/hal/.styleguide
index 89c9541dfc..83d03b0304 100644
--- a/hal/.styleguide
+++ b/hal/.styleguide
@@ -1,26 +1,21 @@
-cppHeaderExtensions {
-  h
-  hpp
-  inc
+cppHeaderFileInclude {
+  \.h$
+  \.hpp$
+  \.inc$
 }
 
-cppSrcExtensions {
-  cpp
+cppSrcFileInclude {
+  \.cpp$
 }
 
-otherExtensions {
-  java
-}
-
-genFileExclude {
+generatedFileExclude {
   gmock/
-  ni-libraries/
+  ni-libraries/include/
+  ni-libraries/lib/
   hal/src/main/native/athena/ctre/
   hal/src/main/native/athena/frccansae/
   hal/src/main/native/athena/visa/
   hal/src/main/native/include/ctre/
-  simulation/JavaGazebo/build/classes/main/gazebo/msgs/
-  wpilibj/src/athena/cpp/nivision/
   UsageReporting\.h$
 }
 
diff --git a/wpilibj/src/main/native/cpp/.styleguide b/wpilibj/src/main/native/cpp/.styleguide
index 4eff33eebd..44ae5fb548 100644
--- a/wpilibj/src/main/native/cpp/.styleguide
+++ b/wpilibj/src/main/native/cpp/.styleguide
@@ -1,26 +1,21 @@
-cppHeaderExtensions {
-  h
-  hpp
-  inc
+cppHeaderFileInclude {
+  \.h$
+  \.hpp$
+  \.inc$
 }
 
-cppSrcExtensions {
-  cpp
+cppSrcFileInclude {
+  \.cpp$
 }
 
-otherExtensions {
-  java
-}
-
-genFileExclude {
+generatedFileExclude {
   gmock/
-  ni-libraries/
+  ni-libraries/include/
+  ni-libraries/lib/
   hal/src/main/native/athena/ctre/
   hal/src/main/native/athena/frccansae/
   hal/src/main/native/athena/visa/
   hal/src/main/native/include/ctre/
-  simulation/JavaGazebo/build/classes/main/gazebo/msgs/
-  wpilibj/src/athena/cpp/nivision/
   UsageReporting\.h$
 }