diff --git a/HISTORY.rst b/HISTORY.rst
index 9d616f9f62..52b406e494 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -29,6 +29,8 @@ PlatformIO 2.0
   (`issue #272 <https://github.com/platformio/platformio/issues/272>`_)
 * Generate "readme.txt" for project "lib" directory
   (`issue #273 <https://github.com/platformio/platformio/issues/273>`_)
+* Use toolchain's includes pattern ``include*`` for Project Generator
+  (`issue #277 <https://github.com/platformio/platformio/issues/277>`_)
 * Fixed includes list for Windows OS when generating project for `Eclipse IDE <http://docs.platformio.org/en/latest/ide/eclipse.html>`__
   (`issue #270 <https://github.com/platformio/platformio/issues/270>`_)
 * Fixed ``AttributeError: 'module' object has no attribute 'packages'``
diff --git a/platformio/__init__.py b/platformio/__init__.py
index c2a8a344a1..8b0740cd2c 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -1,7 +1,7 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
-VERSION = (2, 3, "0a2")
+VERSION = (2, 3, "0a3")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index fb3f3fcaf0..de64d60684 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -135,8 +135,8 @@ def DumpIDEData(env):
     toolchain_dir = env.subst(
         join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN"))
     toolchain_incglobs = [
-        join(toolchain_dir, "*", "include"),
-        join(toolchain_dir, "lib", "gcc", "*", "*", "include")
+        join(toolchain_dir, "*", "include*"),
+        join(toolchain_dir, "lib", "gcc", "*", "*", "include*")
     ]
     for g in toolchain_incglobs:
         data['includes'].extend(glob(g))