Prefix all grbl files with grbl to avoid conflicts..

grbl/grbl.h

@@ -40,27 +40,27 @@
 #include <stdio.h>
 
 // Define the Grbl system include files. NOTE: Do not alter organization.
-#include "config.h"
-#include "nuts_bolts.h"
-#include "settings.h"
-#include "system.h"
-#include "defaults.h"
-#include "cpu_map.h"
-#include "planner.h"
-#include "coolant_control.h"
-#include "eeprom.h"
-#include "gcode.h"
+#include "grbl_config.h"
+#include "grbl_nuts_bolts.h"
+#include "grbl_settings.h"
+#include "grbl_system.h"
+#include "grbl_defaults.h"
+#include "grbl_cpu_map.h"
+#include "grbl_planner.h"
+#include "grbl_coolant_control.h"
+#include "grbl_eeprom.h"
+#include "grbl_gcode.h"
 #include "grbl_limits.h"
-#include "motion_control.h"
-#include "planner.h"
-#include "print.h"
-#include "probe.h"
-#include "protocol.h"
-#include "report.h"
-#include "serial.h"
-#include "spindle_control.h"
-#include "stepper.h"
-#include "jog.h"
+#include "grbl_motion_control.h"
+#include "grbl_planner.h"
+#include "grbl_print.h"
+#include "grbl_probe.h"
+#include "grbl_protocol.h"
+#include "grbl_report.h"
+#include "grbl_serial.h"
+#include "grbl_spindle_control.h"
+#include "grbl_stepper.h"
+#include "grbl_jog.h"
 
 // ---------------------------------------------------------------------------------------
 // COMPILE-TIME ERROR CHECKING OF DEFINE VALUES:

grbl/grbl_jog.h

@@ -21,7 +21,7 @@
 #ifndef jog_h
 #define jog_h
 
-#include "gcode.h"
+#include "grbl_gcode.h"
 
 // System motion line numbers must be zero.
 #define JOG_LINE_NUMBER 0