diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb
index fe62edc..85e4e91 100644
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -54,7 +54,8 @@ class UnityTestRunnerGenerator
     source = File.read(input_file)
     source = source.force_encoding("ISO-8859-1").encode("utf-8", :replace => nil) if ($QUICK_RUBY_VERSION > 10900)
     tests               = find_tests(source)
-    testfile_includes   = find_includes(source)
+    headers             = find_includes(source)
+    testfile_includes   = headers[:local] + headers[:system]
     used_mocks          = find_mocks(testfile_includes)
 
     #build runner file
@@ -128,9 +129,10 @@ class UnityTestRunnerGenerator
     source.gsub!(/\/\/.*$/, '')                          # remove line comments (all that remain)
 
     #parse out includes
-    includes = source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten
-    brackets_includes = source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten
-    brackets_includes.each { |inc| includes << '<' + inc +'>' }
+    includes = {
+      local: source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten,
+      system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" }
+    }
     return includes
   end
 
diff --git a/release/build.info b/release/build.info
index 7871b21..0eec1a0 100644
--- a/release/build.info
+++ b/release/build.info
@@ -1,2 +1,2 @@
-118
+119
 
diff --git a/release/version.info b/release/version.info
index edbec98..a894319 100644
--- a/release/version.info
+++ b/release/version.info
@@ -1,2 +1,2 @@
-2.2.0
+2.3.0