diff --git a/HISTORY.rst b/HISTORY.rst
index 603d80c0..64c67664 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -20,6 +20,7 @@ PlatformIO 2.0
 
 * Simplified documentation for `Continuous Integration with AppVeyor <http://docs.platformio.org/en/latest/ci/appveyor.html>`__
   (`issue #671 <https://github.com/platformio/platformio/issues/671>`_)
+* Automatically add source directory to ``CPPPATH`` of Build System
 * Added support for Silicon Labs SLSTK3401A (Pearl Gecko) and
   MultiTech mDot F411 ARM mbed based boards
 * Added support for MightyCore ATmega8535 board
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 1be9a2c0..f7c88fd5 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -79,6 +79,7 @@ def BuildProgram(env):
     env.Append(
         CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
             *pioversion_to_intstr())],
+        CPPPATH=["$PROJECTSRC_DIR"],
         LIBS=deplibs,
         LIBPATH=["$BUILD_DIR"]
     )