diff --git a/wpilibc/src/main/native/include/frc/WPILib.h b/wpilibc/src/main/native/include/frc/WPILib.h
index aba8483773..69fa061f42 100644
--- a/wpilibc/src/main/native/include/frc/WPILib.h
+++ b/wpilibc/src/main/native/include/frc/WPILib.h
@@ -7,6 +7,15 @@
 
 #pragma once
 
+// clang-format off
+#ifdef _MSC_VER
+#pragma message "warning: Including this header drastically increases compilation times and is bad style. Include only what you use instead."
+#else
+#warning "Including this header drastically increases compilation times and is bad style. Include only what you use instead."
+#endif
+
+// clang-format on
+
 #include <cameraserver/CameraServer.h>
 #include <vision/VisionRunner.h>
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp
index 5974f1f8b5..48afffbc8a 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/OI.cpp
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------------------*/
-/* Copyright (c) 2017-2018 FIRST. All Rights Reserved.                        */
+/* Copyright (c) 2017-2019 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.                                                               */
@@ -7,8 +7,6 @@
 
 #include "OI.h"
 
-#include <frc/WPILib.h>
-
 OI::OI() {
   // Process operator interface input here.
 }