diff --git a/wpiutil/.styleguide b/wpiutil/.styleguide
index 7c8f721089..150527487f 100644
--- a/wpiutil/.styleguide
+++ b/wpiutil/.styleguide
@@ -27,7 +27,7 @@ generatedFileExclude {
   src/main/native/include/wpi/MathExtras\.h$
   src/main/native/include/wpi/NativeFormatting\.h$
   src/main/native/include/wpi/None\.h$
-  src/main/native/include/wpi/Optional\.h$
+  src/main/native/include/wpi/LLVMOptional\.h$
   src/main/native/include/wpi/Path\.h$
   src/main/native/include/wpi/PointerLikeTypeTraits\.h$
   src/main/native/include/wpi/STLExtras\.h$
diff --git a/wpiutil/src/main/native/include/llvm/Optional.h b/wpiutil/src/main/native/include/llvm/Optional.h
deleted file mode 100644
index 3d237f6662..0000000000
--- a/wpiutil/src/main/native/include/llvm/Optional.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* 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
-
-// clang-format off
-#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
-// clang-format on
-
-#include "wpi/Optional.h"
-
-namespace llvm = wpi;
diff --git a/wpiutil/src/main/native/include/wpi/Optional.h b/wpiutil/src/main/native/include/wpi/LLVMOptional.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Optional.h
rename to wpiutil/src/main/native/include/wpi/LLVMOptional.h
diff --git a/wpiutil/src/main/native/include/wpi/NativeFormatting.h b/wpiutil/src/main/native/include/wpi/NativeFormatting.h
index a194027da5..baeb724ca5 100644
--- a/wpiutil/src/main/native/include/wpi/NativeFormatting.h
+++ b/wpiutil/src/main/native/include/wpi/NativeFormatting.h
@@ -10,7 +10,7 @@
 #ifndef WPIUTIL_WPI_NATIVE_FORMATTING_H
 #define WPIUTIL_WPI_NATIVE_FORMATTING_H
 
-#include "wpi/Optional.h"
+#include "wpi/LLVMOptional.h"
 #include "wpi/raw_ostream.h"
 
 #include <cstdint>
diff --git a/wpiutil/src/main/native/include/wpi/STLExtras.h b/wpiutil/src/main/native/include/wpi/STLExtras.h
index de6c12d5ca..5fc6d32a03 100644
--- a/wpiutil/src/main/native/include/wpi/STLExtras.h
+++ b/wpiutil/src/main/native/include/wpi/STLExtras.h
@@ -17,7 +17,7 @@
 #ifndef WPIUTIL_WPI_STLEXTRAS_H
 #define WPIUTIL_WPI_STLEXTRAS_H
 
-#include "wpi/Optional.h"
+#include "wpi/LLVMOptional.h"
 #include "wpi/SmallVector.h"
 #include "wpi/iterator.h"
 #include "wpi/iterator_range.h"