diff --git a/HISTORY.rst b/HISTORY.rst
index f12a78ef..413a82c0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,7 @@ PlatformIO 3.0
 3.6.2 (2018-??-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Fixed an issue with VSCode IntelliSense warning about the missed headers located in `include <http://docs.platformio.org/page/projectconf/section_platformio.html#include-dir>`__ folder
 * Fixed incorrect wording when initializing/updating project
 
 3.6.1 (2018-10-29)
diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py
index 063ce45d..8ff6888f 100644
--- a/platformio/builder/tools/pioide.py
+++ b/platformio/builder/tools/pioide.py
@@ -25,7 +25,7 @@ from platformio.managers.core import get_core_package_dir
 
 
 def _dump_includes(env):
-    includes = [env.subst("$PROJECTINCLUDE_DIR"), env.subst("$PROJECTSRC_DIR")]
+    includes = []
 
     for item in env.get("CPPPATH", []):
         includes.append(env.subst(item))
@@ -53,6 +53,9 @@ def _dump_includes(env):
     if unity_dir:
         includes.append(unity_dir)
 
+    includes.extend(
+        env.subst("$PROJECTINCLUDE_DIR"), env.subst("$PROJECTSRC_DIR"))
+
     # remove duplicates
     result = []
     for item in includes: