diff --git a/cscore/src/main/native/include/cscore_c.h b/cscore/src/main/native/include/cscore_c.h
index da3043ce94..8258ee78d9 100644
--- a/cscore/src/main/native/include/cscore_c.h
+++ b/cscore/src/main/native/include/cscore_c.h
@@ -10,7 +10,11 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
 #include <cstddef>
+#else
+#include <stddef.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ntcore/src/main/native/include/ntcore_c.h b/ntcore/src/main/native/include/ntcore_c.h
index c30296fb48..969a2760b3 100644
--- a/ntcore/src/main/native/include/ntcore_c.h
+++ b/ntcore/src/main/native/include/ntcore_c.h
@@ -10,18 +10,18 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+#include <cstddef>
+#else
+#include <stddef.h>
+#endif
+
 #include <wpi/deprecated.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef __cplusplus
-#include <cstddef>
-#else
-#include <cstddef>
-#endif
-
 /** Typedefs */
 typedef int NT_Bool;