SCRIPT Run cc include replacements

ntcore/src/generated/main/native/cpp/jni/types_jni.cpp

@@ -6,10 +6,10 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_networktables_NetworkTablesJNI.h"
-#include "ntcore.h"
+#include "wpi/nt/ntcore.h"
 
 using namespace wpi::java;
 

ntcore/src/generated/main/native/cpp/ntcore_c_types.cpp

@@ -4,10 +4,10 @@
 
 // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY
 
-#include "ntcore_c_types.h"
+#include "wpi/nt/ntcore_c_types.h"
 
-#include "Value_internal.h"
-#include "ntcore_cpp.h"
+#include "Value_internal.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 using namespace nt;
 

ntcore/src/generated/main/native/cpp/ntcore_cpp_types.cpp

@@ -4,10 +4,10 @@
 
 // THIS FILE WAS AUTO-GENERATED BY ./ntcore/generate_topics.py. DO NOT MODIFY
 
-#include "ntcore_cpp_types.h"
+#include "wpi/nt/ntcore_cpp_types.hpp"
 
-#include "Handle.h"
-#include "InstanceImpl.h"
+#include "Handle.hpp"
+#include "InstanceImpl.hpp"
 
 namespace {
 template <nt::ValidType T>

ntcore/src/generated/main/native/include/wpi/nt/BooleanArrayTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/BooleanTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/DoubleArrayTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/DoubleTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/FloatArrayTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/FloatTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/IntegerArrayTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/IntegerTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/RawTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/StringArrayTopic.hpp

@@ -13,11 +13,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/StringTopic.hpp

@@ -15,11 +15,11 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
-#include "networktables/NetworkTableType.h"
-#include "networktables/Topic.h"
-#include "ntcore_cpp.h"
+#include "wpi/nt/NetworkTableType.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace wpi {
 template <typename T>

ntcore/src/generated/main/native/include/wpi/nt/ntcore_c_types.h

@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-#include "ntcore_c.h"
+#include "wpi/nt/ntcore_c.h"
 
 #ifdef __cplusplus
 extern "C" {

ntcore/src/generated/main/native/include/wpi/nt/ntcore_cpp_types.hpp

@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-#include "ntcore_c.h"
+#include "wpi/nt/ntcore_c.h"
 
 namespace wpi {
 template <typename T>