diff --git a/Marlin/BlinkM.__cpp b/Marlin/BlinkM.cpp
similarity index 100%
rename from Marlin/BlinkM.__cpp
rename to Marlin/BlinkM.cpp
diff --git a/Marlin/BlinkM.__h b/Marlin/BlinkM.h
similarity index 100%
rename from Marlin/BlinkM.__h
rename to Marlin/BlinkM.h
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 3e3cabc1e7a21b8e453587904f4d31dc8976f3ab..e3e2556fab5f2f7d40502366b99c3cbc87e3e92e 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -19,7 +19,10 @@ int absPreheatHotendTemp;
 int absPreheatHPBTemp;
 int absPreheatFanSpeed;
 
+#ifdef ULTIPANEL
 static float manual_feedrate[] = MANUAL_FEEDRATE;
+#endif // ULTIPANEL
+
 /* !Configuration settings */
 
 //Function pointer to menu functions.