diff --git a/cscore/src/main/native/include/cscore_oo.h b/cscore/src/main/native/include/cscore_oo.h
index e94cdca383..138495d5c7 100644
--- a/cscore/src/main/native/include/cscore_oo.h
+++ b/cscore/src/main/native/include/cscore_oo.h
@@ -1040,6 +1040,6 @@ class VideoListener {
 
 }  // namespace cs
 
-#include "cscore_oo.inl"
+#include "cscore_oo.inc"
 
 #endif  // CSCORE_CSCORE_OO_H_
diff --git a/cscore/src/main/native/include/cscore_oo.inl b/cscore/src/main/native/include/cscore_oo.inc
similarity index 99%
rename from cscore/src/main/native/include/cscore_oo.inl
rename to cscore/src/main/native/include/cscore_oo.inc
index 4d90bd27e2..887bd74522 100644
--- a/cscore/src/main/native/include/cscore_oo.inl
+++ b/cscore/src/main/native/include/cscore_oo.inc
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_CSCORE_OO_INL_
-#define CSCORE_CSCORE_OO_INL_
+#ifndef CSCORE_CSCORE_OO_INC_
+#define CSCORE_CSCORE_OO_INC_
 
 #include <string>
 #include <utility>
@@ -648,4 +648,4 @@ inline VideoListener::~VideoListener() {
 
 }  // namespace cs
 
-#endif  // CSCORE_CSCORE_OO_INL_
+#endif  // CSCORE_CSCORE_OO_INC_
diff --git a/glass/src/lib/native/include/glass/support/IniSaver.h b/glass/src/lib/native/include/glass/support/IniSaver.h
index 8298d09c08..1312c0d517 100644
--- a/glass/src/lib/native/include/glass/support/IniSaver.h
+++ b/glass/src/lib/native/include/glass/support/IniSaver.h
@@ -40,4 +40,4 @@ class IniSaver : public IniSaverBase {
 
 }  // namespace glass
 
-#include "IniSaver.inl"
+#include "IniSaver.inc"
diff --git a/glass/src/lib/native/include/glass/support/IniSaver.inl b/glass/src/lib/native/include/glass/support/IniSaver.inc
similarity index 100%
rename from glass/src/lib/native/include/glass/support/IniSaver.inl
rename to glass/src/lib/native/include/glass/support/IniSaver.inc
diff --git a/glass/src/lib/native/include/glass/support/IniSaverString.h b/glass/src/lib/native/include/glass/support/IniSaverString.h
index cc909f3abf..9ac3d70d55 100644
--- a/glass/src/lib/native/include/glass/support/IniSaverString.h
+++ b/glass/src/lib/native/include/glass/support/IniSaverString.h
@@ -53,4 +53,4 @@ class IniSaverString : public IniSaverBase {
 
 }  // namespace glass
 
-#include "IniSaverString.inl"
+#include "IniSaverString.inc"
diff --git a/glass/src/lib/native/include/glass/support/IniSaverString.inl b/glass/src/lib/native/include/glass/support/IniSaverString.inc
similarity index 100%
rename from glass/src/lib/native/include/glass/support/IniSaverString.inl
rename to glass/src/lib/native/include/glass/support/IniSaverString.inc
diff --git a/glass/src/lib/native/include/glass/support/IniSaverVector.h b/glass/src/lib/native/include/glass/support/IniSaverVector.h
index 511be05615..86b2bbc1ff 100644
--- a/glass/src/lib/native/include/glass/support/IniSaverVector.h
+++ b/glass/src/lib/native/include/glass/support/IniSaverVector.h
@@ -28,4 +28,4 @@ class IniSaverVector : public std::vector<Info>, public IniSaverBase {
 
 }  // namespace glass
 
-#include "IniSaverVector.inl"
+#include "IniSaverVector.inc"
diff --git a/glass/src/lib/native/include/glass/support/IniSaverVector.inl b/glass/src/lib/native/include/glass/support/IniSaverVector.inc
similarity index 100%
rename from glass/src/lib/native/include/glass/support/IniSaverVector.inl
rename to glass/src/lib/native/include/glass/support/IniSaverVector.inc
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableEntry.h b/ntcore/src/main/native/include/networktables/NetworkTableEntry.h
index 5b5a0fd5d7..92c1f352f1 100644
--- a/ntcore/src/main/native/include/networktables/NetworkTableEntry.h
+++ b/ntcore/src/main/native/include/networktables/NetworkTableEntry.h
@@ -636,6 +636,6 @@ class NetworkTableEntry final {
 
 }  // namespace nt
 
-#include "networktables/NetworkTableEntry.inl"
+#include "networktables/NetworkTableEntry.inc"
 
 #endif  // NTCORE_NETWORKTABLES_NETWORKTABLEENTRY_H_
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableEntry.inl b/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc
similarity index 98%
rename from ntcore/src/main/native/include/networktables/NetworkTableEntry.inl
rename to ntcore/src/main/native/include/networktables/NetworkTableEntry.inc
index 8afbb45daf..ba1628e4d6 100644
--- a/ntcore/src/main/native/include/networktables/NetworkTableEntry.inl
+++ b/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef NTCORE_NETWORKTABLES_NETWORKTABLEENTRY_INL_
-#define NTCORE_NETWORKTABLES_NETWORKTABLEENTRY_INL_
+#ifndef NTCORE_NETWORKTABLES_NETWORKTABLEENTRY_INC_
+#define NTCORE_NETWORKTABLES_NETWORKTABLEENTRY_INC_
 
 #include <memory>
 #include <string>
@@ -340,4 +340,4 @@ inline void NetworkTableEntry::RemoveListener(NT_EntryListener entry_listener) {
 
 }  // namespace nt
 
-#endif  // NTCORE_NETWORKTABLES_NETWORKTABLEENTRY_INL_
+#endif  // NTCORE_NETWORKTABLES_NETWORKTABLEENTRY_INC_
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableInstance.h b/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
index 5284091419..89c4fe038e 100644
--- a/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
+++ b/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
@@ -567,6 +567,6 @@ class NetworkTableInstance final {
 
 }  // namespace nt
 
-#include "networktables/NetworkTableInstance.inl"
+#include "networktables/NetworkTableInstance.inc"
 
 #endif  // NTCORE_NETWORKTABLES_NETWORKTABLEINSTANCE_H_
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableInstance.inl b/ntcore/src/main/native/include/networktables/NetworkTableInstance.inc
similarity index 97%
rename from ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
rename to ntcore/src/main/native/include/networktables/NetworkTableInstance.inc
index ef8e9f3f86..ea8e74f447 100644
--- a/ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
+++ b/ntcore/src/main/native/include/networktables/NetworkTableInstance.inc
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef NTCORE_NETWORKTABLES_NETWORKTABLEINSTANCE_INL_
-#define NTCORE_NETWORKTABLES_NETWORKTABLEINSTANCE_INL_
+#ifndef NTCORE_NETWORKTABLES_NETWORKTABLEINSTANCE_INC_
+#define NTCORE_NETWORKTABLES_NETWORKTABLEINSTANCE_INC_
 
 #include <utility>
 #include <vector>
@@ -208,4 +208,4 @@ inline bool NetworkTableInstance::WaitForLoggerQueue(double timeout) {
 
 }  // namespace nt
 
-#endif  // NTCORE_NETWORKTABLES_NETWORKTABLEINSTANCE_INL_
+#endif  // NTCORE_NETWORKTABLES_NETWORKTABLEINSTANCE_INC_
diff --git a/ntcore/src/main/native/include/networktables/RpcCall.h b/ntcore/src/main/native/include/networktables/RpcCall.h
index dd4991bc5f..9c6e9f90c1 100644
--- a/ntcore/src/main/native/include/networktables/RpcCall.h
+++ b/ntcore/src/main/native/include/networktables/RpcCall.h
@@ -101,6 +101,6 @@ class RpcCall final {
 
 }  // namespace nt
 
-#include "networktables/RpcCall.inl"
+#include "networktables/RpcCall.inc"
 
 #endif  // NTCORE_NETWORKTABLES_RPCCALL_H_
diff --git a/ntcore/src/main/native/include/networktables/RpcCall.inl b/ntcore/src/main/native/include/networktables/RpcCall.inc
similarity index 89%
rename from ntcore/src/main/native/include/networktables/RpcCall.inl
rename to ntcore/src/main/native/include/networktables/RpcCall.inc
index 4780e961c4..5e25b0410e 100644
--- a/ntcore/src/main/native/include/networktables/RpcCall.inl
+++ b/ntcore/src/main/native/include/networktables/RpcCall.inc
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef NTCORE_NETWORKTABLES_RPCCALL_INL_
-#define NTCORE_NETWORKTABLES_RPCCALL_INL_
+#ifndef NTCORE_NETWORKTABLES_RPCCALL_INC_
+#define NTCORE_NETWORKTABLES_RPCCALL_INC_
 
 #include <string>
 #include <utility>
@@ -48,4 +48,4 @@ inline void RpcCall::CancelResult() {
 
 }  // namespace nt
 
-#endif  // NTCORE_NETWORKTABLES_RPCCALL_INL_
+#endif  // NTCORE_NETWORKTABLES_RPCCALL_INC_
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSHalProviders.h b/simulation/halsim_ws_core/src/main/native/include/WSHalProviders.h
index 619b0b5513..ce12c59495 100644
--- a/simulation/halsim_ws_core/src/main/native/include/WSHalProviders.h
+++ b/simulation/halsim_ws_core/src/main/native/include/WSHalProviders.h
@@ -63,4 +63,4 @@ void CreateSingleProvider(const std::string& key,
 
 }  // namespace wpilibws
 
-#include "WSHalProviders.inl"
+#include "WSHalProviders.inc"
diff --git a/simulation/halsim_ws_core/src/main/native/include/WSHalProviders.inl b/simulation/halsim_ws_core/src/main/native/include/WSHalProviders.inc
similarity index 100%
rename from simulation/halsim_ws_core/src/main/native/include/WSHalProviders.inl
rename to simulation/halsim_ws_core/src/main/native/include/WSHalProviders.inc
diff --git a/wpiutil/src/main/native/include/wpi/HttpUtil.h b/wpiutil/src/main/native/include/wpi/HttpUtil.h
index 84bb19f147..320ea4fae5 100644
--- a/wpiutil/src/main/native/include/wpi/HttpUtil.h
+++ b/wpiutil/src/main/native/include/wpi/HttpUtil.h
@@ -411,6 +411,6 @@ class HttpMultipartScanner {
 
 }  // namespace wpi
 
-#include "HttpUtil.inl"
+#include "HttpUtil.inc"
 
 #endif  // WPIUTIL_WPI_HTTPUTIL_H_
diff --git a/wpiutil/src/main/native/include/wpi/HttpUtil.inl b/wpiutil/src/main/native/include/wpi/HttpUtil.inc
similarity index 92%
rename from wpiutil/src/main/native/include/wpi/HttpUtil.inl
rename to wpiutil/src/main/native/include/wpi/HttpUtil.inc
index 546a483a5b..a433402072 100644
--- a/wpiutil/src/main/native/include/wpi/HttpUtil.inl
+++ b/wpiutil/src/main/native/include/wpi/HttpUtil.inc
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_HTTPUTIL_INL_
-#define WPIUTIL_WPI_HTTPUTIL_INL_
+#ifndef WPIUTIL_WPI_HTTPUTIL_INC_
+#define WPIUTIL_WPI_HTTPUTIL_INC_
 
 #include <utility>
 
@@ -52,4 +52,4 @@ void HttpRequest::SetPath(StringRef path_, const T& params) {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_HTTPUTIL_INL_
+#endif  // WPIUTIL_WPI_HTTPUTIL_INC_
diff --git a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.h b/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.h
index f0b2522df0..f42f0fbc84 100644
--- a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.h
+++ b/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.h
@@ -86,6 +86,6 @@ class HttpWebSocketServerConnection
 
 }  // namespace wpi
 
-#include "HttpWebSocketServerConnection.inl"
+#include "HttpWebSocketServerConnection.inc"
 
 #endif  // WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_H_
diff --git a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inl b/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inc
similarity index 89%
rename from wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inl
rename to wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inc
index ce2cf2e3bd..235f6ce729 100644
--- a/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inl
+++ b/wpiutil/src/main/native/include/wpi/HttpWebSocketServerConnection.inc
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INL_
-#define WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INL_
+#ifndef WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INC_
+#define WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INC_
 
 #include <memory>
 
@@ -52,4 +52,4 @@ HttpWebSocketServerConnection<Derived>::HttpWebSocketServerConnection(
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INL_
+#endif  // WPIUTIL_WPI_HTTPWEBSOCKETSERVERCONNECTION_INC_