diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h
index a49d0fa7..1bb3cdbc 100644
--- a/Grbl_Esp32/grbl.h
+++ b/Grbl_Esp32/grbl.h
@@ -45,7 +45,7 @@
 #include "coolant_control.h"
 #include "eeprom.h"
 #include "gcode.h"
-#include "limits.h"
+#include "grbl_limits.h"
 #include "motion_control.h"
 #include "print.h"
 #include "probe.h"
diff --git a/Grbl_Esp32/limits.cpp b/Grbl_Esp32/grbl_limits.cpp
similarity index 98%
rename from Grbl_Esp32/limits.cpp
rename to Grbl_Esp32/grbl_limits.cpp
index ab52a220..faa0723e 100644
--- a/Grbl_Esp32/limits.cpp
+++ b/Grbl_Esp32/grbl_limits.cpp
@@ -7,6 +7,9 @@
 	
 	2018 -	Bart Dring This file was modifed for use on the ESP32
 					CPU. Do not use this with Grbl for atMega328P
+  2018-12-29 - Wolfgang Lienbacher renamed file from limits.h to grbl_limits.h 
+          fixing ambiguation issues with limit.h in the esp32 Arduino Framework 
+          when compiling with VS-Code/PlatformIO.
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/Grbl_Esp32/limits.h b/Grbl_Esp32/grbl_limits.h
similarity index 84%
rename from Grbl_Esp32/limits.h
rename to Grbl_Esp32/grbl_limits.h
index d0938ea0..cba63f09 100644
--- a/Grbl_Esp32/limits.h
+++ b/Grbl_Esp32/grbl_limits.h
@@ -7,6 +7,9 @@
 	
 	2018 -	Bart Dring This file was modifed for use on the ESP32
 					CPU. Do not use this with Grbl for atMega328P
+  2018-12-29 - Wolfgang Lienbacher renamed file from limits.h to grbl_limits.h 
+          fixing ambiguation issues with limit.h in the esp32 Arduino Framework 
+          when compiling with VS-Code/PlatformIO.
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,8 +25,8 @@
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef limits_h
-#define limits_h
+#ifndef grbl_limits_h
+#define grbl_limits_h
 
 
 // Initialize the limits module