diff --git a/platformio.ini b/platformio.ini
index 86e3e5a80..d0ff134cf 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -17,7 +17,7 @@
 
 [platformio]
 src_dir = Marlin
-envs_dir = .pioenvs
+build_dir = .pioenvs
 lib_dir = .piolib
 libdeps_dir = .piolibdeps
 env_default = megaatmega2560
@@ -54,7 +54,7 @@ build_flags = -fmax-errors=5
 platform    = atmelavr
 framework   = arduino
 board       = megaatmega2560
-build_flags = ${common.build_flags} -I $BUILDSRC_DIR
+build_flags = ${common.build_flags}
 board_f_cpu = 16000000L
 lib_deps    = ${common.lib_deps}
 src_filter  = ${common.default_src_filter}
@@ -66,7 +66,7 @@ src_filter  = ${common.default_src_filter}
 platform    = atmelavr
 framework   = arduino
 board       = megaatmega1280
-build_flags = ${common.build_flags} -I $BUILDSRC_DIR
+build_flags = ${common.build_flags}
 board_f_cpu = 16000000L
 lib_deps    = ${common.lib_deps}
 src_filter  = ${common.default_src_filter}
@@ -93,7 +93,7 @@ src_filter   = ${common.default_src_filter}
 platform    = atmelsam
 framework   = arduino
 board       = due
-build_flags = ${common.build_flags} -I $BUILDSRC_DIR
+build_flags = ${common.build_flags}
 lib_deps    = ${common.lib_deps}
 lib_ignore  = TMC26XStepper
 src_filter  = ${common.default_src_filter}
@@ -156,7 +156,7 @@ debug_server   =
 platform    = atmelavr
 framework   = arduino
 board       = reprap_rambo
-build_flags = ${common.build_flags} -I $BUILDSRC_DIR
+build_flags = ${common.build_flags}
 board_f_cpu = 16000000L
 lib_deps    = ${common.lib_deps}
 src_filter  = ${common.default_src_filter}
@@ -192,7 +192,7 @@ src_filter  = ${common.default_src_filter}
 platform      = teensy
 framework     = arduino
 board         = teensy20pp
-build_flags   = ${common.build_flags} -I $BUILDSRC_DIR
+build_flags   = ${common.build_flags}
 #board_f_cpu  = 20000000L     ; Bug in Arduino framework disallows boards running at 20Mhz
 lib_deps      = ${common.lib_deps}
 lib_ldf_mode  = deep+
@@ -205,7 +205,7 @@ src_filter    = ${common.default_src_filter}
 platform    = teensy
 framework   = arduino
 board       = teensy35
-build_flags = ${common.build_flags} -I $BUILDSRC_DIR
+build_flags = ${common.build_flags}
 lib_deps    = ${common.lib_deps}
 lib_ignore  = Adafruit NeoPixel
 src_filter  = ${common.default_src_filter}