diff --git a/wpiutil/src/main/native/include/llvm/AlignOf.h b/wpiutil/src/main/native/include/llvm/AlignOf.h
new file mode 100644
index 0000000000..0e7913f7b8
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/AlignOf.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/AlignOf.h is deprecated; include wpi/AlignOf.h instead"
+#else
+#warning "llvm/AlignOf.h is deprecated; include wpi/AlignOf.h instead"
+#endif
+
+#include "wpi/AlignOf.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/ArrayRef.h b/wpiutil/src/main/native/include/llvm/ArrayRef.h
new file mode 100644
index 0000000000..41dafc9d5b
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/ArrayRef.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/ArrayRef.h is deprecated; include wpi/ArrayRef.h instead"
+#else
+#warning "llvm/ArrayRef.h is deprecated; include wpi/ArrayRef.h instead"
+#endif
+
+#include "wpi/ArrayRef.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/Compiler.h b/wpiutil/src/main/native/include/llvm/Compiler.h
new file mode 100644
index 0000000000..f086fef76e
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/Compiler.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/Compiler.h is deprecated; include wpi/Compiler.h instead"
+#else
+#warning "llvm/Compiler.h is deprecated; include wpi/Compiler.h instead"
+#endif
+
+#include "wpi/Compiler.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/ConvertUTF.h b/wpiutil/src/main/native/include/llvm/ConvertUTF.h
new file mode 100644
index 0000000000..a39a7757c8
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/ConvertUTF.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/ConvertUTF.h is deprecated; include wpi/ConvertUTF.h instead"
+#else
+#warning "llvm/ConvertUTF.h is deprecated; include wpi/ConvertUTF.h instead"
+#endif
+
+#include "wpi/ConvertUTF.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/DenseMap.h b/wpiutil/src/main/native/include/llvm/DenseMap.h
new file mode 100644
index 0000000000..a17dabefab
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/DenseMap.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/DenseMap.h is deprecated; include wpi/DenseMap.h instead"
+#else
+#warning "llvm/DenseMap.h is deprecated; include wpi/DenseMap.h instead"
+#endif
+
+#include "wpi/DenseMap.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/DenseMapInfo.h b/wpiutil/src/main/native/include/llvm/DenseMapInfo.h
new file mode 100644
index 0000000000..3d24dcf885
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/DenseMapInfo.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/DenseMapInfo.h is deprecated; include wpi/DenseMapInfo.h instead"
+#else
+#warning "llvm/DenseMapInfo.h is deprecated; include wpi/DenseMapInfo.h instead"
+#endif
+
+#include "wpi/DenseMapInfo.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/EpochTracker.h b/wpiutil/src/main/native/include/llvm/EpochTracker.h
new file mode 100644
index 0000000000..bb30826473
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/EpochTracker.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/EpochTracker.h is deprecated; include wpi/EpochTracker.h instead"
+#else
+#warning "llvm/EpochTracker.h is deprecated; include wpi/EpochTracker.h instead"
+#endif
+
+#include "wpi/EpochTracker.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/FileSystem.h b/wpiutil/src/main/native/include/llvm/FileSystem.h
new file mode 100644
index 0000000000..0bb973a6a7
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/FileSystem.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/FileSystem.h is deprecated; include wpi/FileSystem.h instead"
+#else
+#warning "llvm/FileSystem.h is deprecated; include wpi/FileSystem.h instead"
+#endif
+
+#include "wpi/FileSystem.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/Format.h b/wpiutil/src/main/native/include/llvm/Format.h
new file mode 100644
index 0000000000..e6be1d7299
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/Format.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/Format.h is deprecated; include wpi/Format.h instead"
+#else
+#warning "llvm/Format.h is deprecated; include wpi/Format.h instead"
+#endif
+
+#include "wpi/Format.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/Hashing.h b/wpiutil/src/main/native/include/llvm/Hashing.h
new file mode 100644
index 0000000000..8b01b45ef0
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/Hashing.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/Hashing.h is deprecated; include wpi/Hashing.h instead"
+#else
+#warning "llvm/Hashing.h is deprecated; include wpi/Hashing.h instead"
+#endif
+
+#include "wpi/Hashing.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/IntrusiveRefCntPtr.h b/wpiutil/src/main/native/include/llvm/IntrusiveRefCntPtr.h
new file mode 100644
index 0000000000..c41bbd17c1
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/IntrusiveRefCntPtr.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/IntrusiveRefCntPtr.h is deprecated; include wpi/IntrusiveRefCntPtr.h instead"
+#else
+#warning "llvm/IntrusiveRefCntPtr.h is deprecated; include wpi/IntrusiveRefCntPtr.h instead"
+#endif
+
+#include "wpi/IntrusiveRefCntPtr.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/MathExtras.h b/wpiutil/src/main/native/include/llvm/MathExtras.h
new file mode 100644
index 0000000000..64782afb29
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/MathExtras.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/MathExtras.h is deprecated; include wpi/MathExtras.h instead"
+#else
+#warning "llvm/MathExtras.h is deprecated; include wpi/MathExtras.h instead"
+#endif
+
+#include "wpi/MathExtras.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/None.h b/wpiutil/src/main/native/include/llvm/None.h
new file mode 100644
index 0000000000..2346b5a3c2
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/None.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/None.h is deprecated; include wpi/None.h instead"
+#else
+#warning "llvm/None.h is deprecated; include wpi/None.h instead"
+#endif
+
+#include "wpi/None.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/Optional.h b/wpiutil/src/main/native/include/llvm/Optional.h
new file mode 100644
index 0000000000..e5a0c20656
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/Optional.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/Optional.h is deprecated; include wpi/Optional.h instead"
+#else
+#warning "llvm/Optional.h is deprecated; include wpi/Optional.h instead"
+#endif
+
+#include "wpi/Optional.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/Path.h b/wpiutil/src/main/native/include/llvm/Path.h
new file mode 100644
index 0000000000..0249ed8847
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/Path.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/Path.h is deprecated; include wpi/Path.h instead"
+#else
+#warning "llvm/Path.h is deprecated; include wpi/Path.h instead"
+#endif
+
+#include "wpi/Path.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/PointerLikeTypeTraits.h b/wpiutil/src/main/native/include/llvm/PointerLikeTypeTraits.h
new file mode 100644
index 0000000000..bc6cc7ede9
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/PointerLikeTypeTraits.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/PointerLikeTypeTraits.h is deprecated; include wpi/PointerLikeTypeTraits.h instead"
+#else
+#warning "llvm/PointerLikeTypeTraits.h is deprecated; include wpi/PointerLikeTypeTraits.h instead"
+#endif
+
+#include "wpi/PointerLikeTypeTraits.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/STLExtras.h b/wpiutil/src/main/native/include/llvm/STLExtras.h
new file mode 100644
index 0000000000..6a3c1761e8
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/STLExtras.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/STLExtras.h is deprecated; include wpi/STLExtras.h instead"
+#else
+#warning "llvm/STLExtras.h is deprecated; include wpi/STLExtras.h instead"
+#endif
+
+#include "wpi/STLExtras.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/SmallPtrSet.h b/wpiutil/src/main/native/include/llvm/SmallPtrSet.h
new file mode 100644
index 0000000000..ff11423aae
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/SmallPtrSet.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/SmallPtrSet.h is deprecated; include wpi/SmallPtrSet.h instead"
+#else
+#warning "llvm/SmallPtrSet.h is deprecated; include wpi/SmallPtrSet.h instead"
+#endif
+
+#include "wpi/SmallPtrSet.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/SmallSet.h b/wpiutil/src/main/native/include/llvm/SmallSet.h
new file mode 100644
index 0000000000..fc69fc6ddf
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/SmallSet.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/SmallSet.h is deprecated; include wpi/SmallSet.h instead"
+#else
+#warning "llvm/SmallSet.h is deprecated; include wpi/SmallSet.h instead"
+#endif
+
+#include "wpi/SmallSet.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/SmallString.h b/wpiutil/src/main/native/include/llvm/SmallString.h
new file mode 100644
index 0000000000..2130c5af08
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/SmallString.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/SmallString.h is deprecated; include wpi/SmallString.h instead"
+#else
+#warning "llvm/SmallString.h is deprecated; include wpi/SmallString.h instead"
+#endif
+
+#include "wpi/SmallString.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/SmallVector.h b/wpiutil/src/main/native/include/llvm/SmallVector.h
new file mode 100644
index 0000000000..a60a354f50
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/SmallVector.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/SmallVector.h is deprecated; include wpi/SmallVector.h instead"
+#else
+#warning "llvm/SmallVector.h is deprecated; include wpi/SmallVector.h instead"
+#endif
+
+#include "wpi/SmallVector.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/StringExtras.h b/wpiutil/src/main/native/include/llvm/StringExtras.h
new file mode 100644
index 0000000000..2e3b8ef9e8
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/StringExtras.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/StringExtras.h is deprecated; include wpi/StringExtras.h instead"
+#else
+#warning "llvm/StringExtras.h is deprecated; include wpi/StringExtras.h instead"
+#endif
+
+#include "wpi/StringExtras.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/StringMap.h b/wpiutil/src/main/native/include/llvm/StringMap.h
new file mode 100644
index 0000000000..19e4e70e1c
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/StringMap.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/StringMap.h is deprecated; include wpi/StringMap.h instead"
+#else
+#warning "llvm/StringMap.h is deprecated; include wpi/StringMap.h instead"
+#endif
+
+#include "wpi/StringMap.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/StringRef.h b/wpiutil/src/main/native/include/llvm/StringRef.h
new file mode 100644
index 0000000000..7fbc7da35e
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/StringRef.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/StringRef.h is deprecated; include wpi/StringRef.h instead"
+#else
+#warning "llvm/StringRef.h is deprecated; include wpi/StringRef.h instead"
+#endif
+
+#include "wpi/StringRef.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/Twine.h b/wpiutil/src/main/native/include/llvm/Twine.h
new file mode 100644
index 0000000000..6c39d17dd2
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/Twine.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/Twine.h is deprecated; include wpi/Twine.h instead"
+#else
+#warning "llvm/Twine.h is deprecated; include wpi/Twine.h instead"
+#endif
+
+#include "wpi/Twine.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/WindowsError.h b/wpiutil/src/main/native/include/llvm/WindowsError.h
new file mode 100644
index 0000000000..e8312ca110
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/WindowsError.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/WindowsError.h is deprecated; include wpi/WindowsError.h instead"
+#else
+#warning "llvm/WindowsError.h is deprecated; include wpi/WindowsError.h instead"
+#endif
+
+#include "wpi/WindowsError.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/iterator_range.h b/wpiutil/src/main/native/include/llvm/iterator_range.h
new file mode 100644
index 0000000000..9ffe84d7bd
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/iterator_range.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/iterator_range.h is deprecated; include wpi/iterator_range.h instead"
+#else
+#warning "llvm/iterator_range.h is deprecated; include wpi/iterator_range.h instead"
+#endif
+
+#include "wpi/iterator_range.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/raw_os_ostream.h b/wpiutil/src/main/native/include/llvm/raw_os_ostream.h
new file mode 100644
index 0000000000..23bcfac749
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/raw_os_ostream.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/raw_os_ostream.h is deprecated; include wpi/raw_os_ostream.h instead"
+#else
+#warning "llvm/raw_os_ostream.h is deprecated; include wpi/raw_os_ostream.h instead"
+#endif
+
+#include "wpi/raw_os_ostream.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/raw_ostream.h b/wpiutil/src/main/native/include/llvm/raw_ostream.h
new file mode 100644
index 0000000000..0e644ed0fe
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/raw_ostream.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/raw_ostream.h is deprecated; include wpi/raw_ostream.h instead"
+#else
+#warning "llvm/raw_ostream.h is deprecated; include wpi/raw_ostream.h instead"
+#endif
+
+#include "wpi/raw_ostream.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/llvm/type_traits.h b/wpiutil/src/main/native/include/llvm/type_traits.h
new file mode 100644
index 0000000000..34b6b63b2a
--- /dev/null
+++ b/wpiutil/src/main/native/include/llvm/type_traits.h
@@ -0,0 +1,18 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: llvm/type_traits.h is deprecated; include wpi/type_traits.h instead"
+#else
+#warning "llvm/type_traits.h is deprecated; include wpi/type_traits.h instead"
+#endif
+
+#include "wpi/type_traits.h"
+
+namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/support/Base64.h b/wpiutil/src/main/native/include/support/Base64.h
new file mode 100644
index 0000000000..f4bcb762f4
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/Base64.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/Base64.h is deprecated; include wpi/Base64.h instead"
+#else
+#warning "support/Base64.h is deprecated; include wpi/Base64.h instead"
+#endif
+
+#include "wpi/Base64.h"
diff --git a/wpiutil/src/main/native/include/support/ConcurrentQueue.h b/wpiutil/src/main/native/include/support/ConcurrentQueue.h
new file mode 100644
index 0000000000..03d6355cab
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/ConcurrentQueue.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/ConcurrentQueue.h is deprecated; include wpi/ConcurrentQueue.h instead"
+#else
+#warning "support/ConcurrentQueue.h is deprecated; include wpi/ConcurrentQueue.h instead"
+#endif
+
+#include "wpi/ConcurrentQueue.h"
diff --git a/wpiutil/src/main/native/include/support/HttpUtil.h b/wpiutil/src/main/native/include/support/HttpUtil.h
new file mode 100644
index 0000000000..e9554914b8
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/HttpUtil.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/HttpUtil.h is deprecated; include wpi/HttpUtil.h instead"
+#else
+#warning "support/HttpUtil.h is deprecated; include wpi/HttpUtil.h instead"
+#endif
+
+#include "wpi/HttpUtil.h"
diff --git a/wpiutil/src/main/native/include/support/HttpUtil.inl b/wpiutil/src/main/native/include/support/HttpUtil.inl
new file mode 100644
index 0000000000..1b17bd13c9
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/HttpUtil.inl
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/HttpUtil.inl is deprecated; include wpi/HttpUtil.inl instead"
+#else
+#warning "support/HttpUtil.inl is deprecated; include wpi/HttpUtil.inl instead"
+#endif
+
+#include "wpi/HttpUtil.inl"
diff --git a/wpiutil/src/main/native/include/support/Logger.h b/wpiutil/src/main/native/include/support/Logger.h
new file mode 100644
index 0000000000..7fe2deb27b
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/Logger.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/Logger.h is deprecated; include wpi/Logger.h instead"
+#else
+#warning "support/Logger.h is deprecated; include wpi/Logger.h instead"
+#endif
+
+#include "wpi/Logger.h"
diff --git a/wpiutil/src/main/native/include/support/SafeThread.h b/wpiutil/src/main/native/include/support/SafeThread.h
new file mode 100644
index 0000000000..93390f11de
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/SafeThread.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/SafeThread.h is deprecated; include wpi/SafeThread.h instead"
+#else
+#warning "support/SafeThread.h is deprecated; include wpi/SafeThread.h instead"
+#endif
+
+#include "wpi/SafeThread.h"
diff --git a/wpiutil/src/main/native/include/support/UidVector.h b/wpiutil/src/main/native/include/support/UidVector.h
new file mode 100644
index 0000000000..ba3afd2563
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/UidVector.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/UidVector.h is deprecated; include wpi/UidVector.h instead"
+#else
+#warning "support/UidVector.h is deprecated; include wpi/UidVector.h instead"
+#endif
+
+#include "wpi/UidVector.h"
diff --git a/wpiutil/src/main/native/include/support/atomic_static.h b/wpiutil/src/main/native/include/support/atomic_static.h
new file mode 100644
index 0000000000..253c25b59f
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/atomic_static.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/atomic_static.h is deprecated; include wpi/atomic_static.h instead"
+#else
+#warning "support/atomic_static.h is deprecated; include wpi/atomic_static.h instead"
+#endif
+
+#include "wpi/atomic_static.h"
diff --git a/wpiutil/src/main/native/include/support/condition_variable.h b/wpiutil/src/main/native/include/support/condition_variable.h
new file mode 100644
index 0000000000..33fc32339f
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/condition_variable.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/condition_variable.h is deprecated; include wpi/condition_variable.h instead"
+#else
+#warning "support/condition_variable.h is deprecated; include wpi/condition_variable.h instead"
+#endif
+
+#include "wpi/condition_variable.h"
diff --git a/wpiutil/src/main/native/include/support/deprecated.h b/wpiutil/src/main/native/include/support/deprecated.h
new file mode 100644
index 0000000000..ac3eb5141c
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/deprecated.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/deprecated.h is deprecated; include wpi/deprecated.h instead"
+#else
+#warning "support/deprecated.h is deprecated; include wpi/deprecated.h instead"
+#endif
+
+#include "wpi/deprecated.h"
diff --git a/wpiutil/src/main/native/include/support/hostname.h b/wpiutil/src/main/native/include/support/hostname.h
new file mode 100644
index 0000000000..fd446207b4
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/hostname.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/hostname.h is deprecated; include wpi/hostname.h instead"
+#else
+#warning "support/hostname.h is deprecated; include wpi/hostname.h instead"
+#endif
+
+#include "wpi/hostname.h"
diff --git a/wpiutil/src/main/native/include/support/jni_util.h b/wpiutil/src/main/native/include/support/jni_util.h
new file mode 100644
index 0000000000..b8804e0b5f
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/jni_util.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/jni_util.h is deprecated; include wpi/jni_util.h instead"
+#else
+#warning "support/jni_util.h is deprecated; include wpi/jni_util.h instead"
+#endif
+
+#include "wpi/jni_util.h"
diff --git a/wpiutil/src/main/native/include/support/json.h b/wpiutil/src/main/native/include/support/json.h
new file mode 100644
index 0000000000..22bf5314ce
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/json.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/json.h is deprecated; include wpi/json.h instead"
+#else
+#warning "support/json.h is deprecated; include wpi/json.h instead"
+#endif
+
+#include "wpi/json.h"
diff --git a/wpiutil/src/main/native/include/support/leb128.h b/wpiutil/src/main/native/include/support/leb128.h
new file mode 100644
index 0000000000..c9ed28e540
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/leb128.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/leb128.h is deprecated; include wpi/leb128.h instead"
+#else
+#warning "support/leb128.h is deprecated; include wpi/leb128.h instead"
+#endif
+
+#include "wpi/leb128.h"
diff --git a/wpiutil/src/main/native/include/support/mutex.h b/wpiutil/src/main/native/include/support/mutex.h
new file mode 100644
index 0000000000..f9fff344cf
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/mutex.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/mutex.h is deprecated; include wpi/mutex.h instead"
+#else
+#warning "support/mutex.h is deprecated; include wpi/mutex.h instead"
+#endif
+
+#include "wpi/mutex.h"
diff --git a/wpiutil/src/main/native/include/support/priority_condition_variable.h b/wpiutil/src/main/native/include/support/priority_condition_variable.h
new file mode 100644
index 0000000000..760f0c0204
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/priority_condition_variable.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/priority_condition_variable.h is deprecated; include wpi/priority_condition_variable.h instead"
+#else
+#warning "support/priority_condition_variable.h is deprecated; include wpi/priority_condition_variable.h instead"
+#endif
+
+#include "wpi/priority_condition_variable.h"
diff --git a/wpiutil/src/main/native/include/support/priority_mutex.h b/wpiutil/src/main/native/include/support/priority_mutex.h
new file mode 100644
index 0000000000..230bc3c051
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/priority_mutex.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/priority_mutex.h is deprecated; include wpi/priority_mutex.h instead"
+#else
+#warning "support/priority_mutex.h is deprecated; include wpi/priority_mutex.h instead"
+#endif
+
+#include "wpi/priority_mutex.h"
diff --git a/wpiutil/src/main/native/include/support/raw_istream.h b/wpiutil/src/main/native/include/support/raw_istream.h
new file mode 100644
index 0000000000..9f7ed5bd04
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/raw_istream.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/raw_istream.h is deprecated; include wpi/raw_istream.h instead"
+#else
+#warning "support/raw_istream.h is deprecated; include wpi/raw_istream.h instead"
+#endif
+
+#include "wpi/raw_istream.h"
diff --git a/wpiutil/src/main/native/include/support/raw_socket_istream.h b/wpiutil/src/main/native/include/support/raw_socket_istream.h
new file mode 100644
index 0000000000..46fa608762
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/raw_socket_istream.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/raw_socket_istream.h is deprecated; include wpi/raw_socket_istream.h instead"
+#else
+#warning "support/raw_socket_istream.h is deprecated; include wpi/raw_socket_istream.h instead"
+#endif
+
+#include "wpi/raw_socket_istream.h"
diff --git a/wpiutil/src/main/native/include/support/raw_socket_ostream.h b/wpiutil/src/main/native/include/support/raw_socket_ostream.h
new file mode 100644
index 0000000000..14e9809f8a
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/raw_socket_ostream.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/raw_socket_ostream.h is deprecated; include wpi/raw_socket_ostream.h instead"
+#else
+#warning "support/raw_socket_ostream.h is deprecated; include wpi/raw_socket_ostream.h instead"
+#endif
+
+#include "wpi/raw_socket_ostream.h"
diff --git a/wpiutil/src/main/native/include/support/sha1.h b/wpiutil/src/main/native/include/support/sha1.h
new file mode 100644
index 0000000000..65c84f75bc
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/sha1.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/sha1.h is deprecated; include wpi/sha1.h instead"
+#else
+#warning "support/sha1.h is deprecated; include wpi/sha1.h instead"
+#endif
+
+#include "wpi/sha1.h"
diff --git a/wpiutil/src/main/native/include/support/timestamp.h b/wpiutil/src/main/native/include/support/timestamp.h
new file mode 100644
index 0000000000..aff3745945
--- /dev/null
+++ b/wpiutil/src/main/native/include/support/timestamp.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: support/timestamp.h is deprecated; include wpi/timestamp.h instead"
+#else
+#warning "support/timestamp.h is deprecated; include wpi/timestamp.h instead"
+#endif
+
+#include "wpi/timestamp.h"
diff --git a/wpiutil/src/main/native/include/tcpsockets/NetworkAcceptor.h b/wpiutil/src/main/native/include/tcpsockets/NetworkAcceptor.h
new file mode 100644
index 0000000000..4976c3f5f2
--- /dev/null
+++ b/wpiutil/src/main/native/include/tcpsockets/NetworkAcceptor.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: tcpsockets/NetworkAcceptor.h is deprecated; include wpi/NetworkAcceptor.h instead"
+#else
+#warning "tcpsockets/NetworkAcceptor.h is deprecated; include wpi/NetworkAcceptor.h instead"
+#endif
+
+#include "wpi/NetworkAcceptor.h"
diff --git a/wpiutil/src/main/native/include/tcpsockets/NetworkStream.h b/wpiutil/src/main/native/include/tcpsockets/NetworkStream.h
new file mode 100644
index 0000000000..d840e6be26
--- /dev/null
+++ b/wpiutil/src/main/native/include/tcpsockets/NetworkStream.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: tcpsockets/NetworkStream.h is deprecated; include wpi/NetworkStream.h instead"
+#else
+#warning "tcpsockets/NetworkStream.h is deprecated; include wpi/NetworkStream.h instead"
+#endif
+
+#include "wpi/NetworkStream.h"
diff --git a/wpiutil/src/main/native/include/tcpsockets/SocketError.h b/wpiutil/src/main/native/include/tcpsockets/SocketError.h
new file mode 100644
index 0000000000..3a317bdf0c
--- /dev/null
+++ b/wpiutil/src/main/native/include/tcpsockets/SocketError.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: tcpsockets/SocketError.h is deprecated; include wpi/SocketError.h instead"
+#else
+#warning "tcpsockets/SocketError.h is deprecated; include wpi/SocketError.h instead"
+#endif
+
+#include "wpi/SocketError.h"
diff --git a/wpiutil/src/main/native/include/tcpsockets/TCPAcceptor.h b/wpiutil/src/main/native/include/tcpsockets/TCPAcceptor.h
new file mode 100644
index 0000000000..65a3c1ab7b
--- /dev/null
+++ b/wpiutil/src/main/native/include/tcpsockets/TCPAcceptor.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: tcpsockets/TCPAcceptor.h is deprecated; include wpi/TCPAcceptor.h instead"
+#else
+#warning "tcpsockets/TCPAcceptor.h is deprecated; include wpi/TCPAcceptor.h instead"
+#endif
+
+#include "wpi/TCPAcceptor.h"
diff --git a/wpiutil/src/main/native/include/tcpsockets/TCPConnector.h b/wpiutil/src/main/native/include/tcpsockets/TCPConnector.h
new file mode 100644
index 0000000000..28402577de
--- /dev/null
+++ b/wpiutil/src/main/native/include/tcpsockets/TCPConnector.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: tcpsockets/TCPConnector.h is deprecated; include wpi/TCPConnector.h instead"
+#else
+#warning "tcpsockets/TCPConnector.h is deprecated; include wpi/TCPConnector.h instead"
+#endif
+
+#include "wpi/TCPConnector.h"
diff --git a/wpiutil/src/main/native/include/tcpsockets/TCPStream.h b/wpiutil/src/main/native/include/tcpsockets/TCPStream.h
new file mode 100644
index 0000000000..5c7a1be9a3
--- /dev/null
+++ b/wpiutil/src/main/native/include/tcpsockets/TCPStream.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: tcpsockets/TCPStream.h is deprecated; include wpi/TCPStream.h instead"
+#else
+#warning "tcpsockets/TCPStream.h is deprecated; include wpi/TCPStream.h instead"
+#endif
+
+#include "wpi/TCPStream.h"
diff --git a/wpiutil/src/main/native/include/udpsockets/UDPClient.h b/wpiutil/src/main/native/include/udpsockets/UDPClient.h
new file mode 100644
index 0000000000..b25b2aab92
--- /dev/null
+++ b/wpiutil/src/main/native/include/udpsockets/UDPClient.h
@@ -0,0 +1,16 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2016-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#pragma message "warning: udpsockets/UDPClient.h is deprecated; include wpi/UDPClient.h instead"
+#else
+#warning "udpsockets/UDPClient.h is deprecated; include wpi/UDPClient.h instead"
+#endif
+
+#include "wpi/UDPClient.h"