diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb
index 8debc5252c4883a0b7824e5625646dafcf03e2a1..a8c2c1416b0508fa84bd46b6d6194170707d4a9c 100644
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -56,7 +56,7 @@ class UnityTestRunnerGenerator
   
   def generate(input_file, output_file, tests, includes, used_mocks)
     File.open(output_file, 'w') do |output|
-      create_header(output, used_mocks)
+      create_header(output, includes, used_mocks)
       create_externs(output, tests, used_mocks)
       create_mock_management(output, used_mocks)
       create_suite_setup_and_teardown(output)
@@ -127,13 +127,13 @@ class UnityTestRunnerGenerator
     return mock_headers  
   end
   
-  def create_header(output, mocks)
+  def create_header(output, includes, mocks)
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     create_runtest(output, mocks)
     output.puts("\n//=======Automagically Detected Files To Include=====")
     output.puts("#include \"#{@options[:framework].to_s}.h\"")
     output.puts('#include "cmock.h"') unless (mocks.empty?)
-    @options[:includes].flatten.uniq.compact.each do |inc|
+    (@options[:includes].flatten.uniq.compact + includes.flatten.uniq.compact).each do |inc|
       output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h','')}.h\""}")
     end
     output.puts('#include <setjmp.h>')