diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index 381255662..baa822d7f 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -24,5 +24,4 @@
  * Conditionals.h
  * OBSOLETE: Replaced by Conditionals_LCD.h and Conditionals_post.h
  */
-
-#error "Please remove the following #include's from your Configuration.h and Configuration_adv.h: macros.h boards.h Conditionals.h Configuration_adv.h SanityCheck.h."
+#include "SanityCheck.h"
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index a32007e3b..1b1bffaec 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -37,10 +37,6 @@
 
 #include "fastio.h"
 
-#ifndef SANITYCHECK_H
-  #error "Your Configuration.h and Configuration_adv.h files are outdated!"
-#endif
-
 #include "enum.h"
 #include "utility.h"
 
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
new file mode 100644
index 000000000..fcf258475
--- /dev/null
+++ b/Marlin/SanityCheck.h
@@ -0,0 +1,27 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SanityCheck.h
+ * OBSOLETE: Moved to SanityCheck.cpp
+ */
+#error "Please remove all #include lines from your Configuration.h and Configuration_adv.h files!"