diff --git a/scripts/create_makefile.rb b/scripts/create_makefile.rb
index 3050547..964d9bc 100644
--- a/scripts/create_makefile.rb
+++ b/scripts/create_makefile.rb
@@ -137,10 +137,11 @@ File.open(TEST_MAKEFILE, 'w') do |mkfile|
     mkfile.puts ''
 
     # Collect mocks to generate
-    system_mocks = cfg[:includes][:system].select { |name| name =~ MOCK_MATCHER }
-    raise 'Mocking of system headers is not yet supported!' unless system_mocks.empty?
+    local_mocks = cfg[:includes][:headers].select do |name|
+      raise 'Mocking of system headers is not yet supported!' if name =~ /^</
 
-    local_mocks = cfg[:includes][:local].select { |name| name =~ MOCK_MATCHER }
+      (name =~ MOCK_MATCHER)
+    end
 
     module_names_to_mock = local_mocks.map { |name| name.sub(/#{MOCK_PREFIX}/, '').to_s }
     headers_to_mock = []
diff --git a/src/cmock.h b/src/cmock.h
index 7c16356..ce6d25f 100644
--- a/src/cmock.h
+++ b/src/cmock.h
@@ -12,7 +12,7 @@
 
 #define CMOCK_VERSION_MAJOR    2
 #define CMOCK_VERSION_MINOR    7
-#define CMOCK_VERSION_BUILD    0
+#define CMOCK_VERSION_BUILD    2
 #define CMOCK_VERSION          ((CMOCK_VERSION_MAJOR << 16) | (CMOCK_VERSION_MINOR << 8) | CMOCK_VERSION_BUILD)
 
 /* should be big enough to index full range of CMOCK_MEM_MAX */
diff --git a/vendor/c_exception b/vendor/c_exception
index 733d3aa..9238352 160000
--- a/vendor/c_exception
+++ b/vendor/c_exception
@@ -1 +1 @@
-Subproject commit 733d3aa659aef76cf9829a3bd27981f11d8a2559
+Subproject commit 923835236bd235b62f56bd5fe1b4c185c80325da
diff --git a/vendor/unity b/vendor/unity
index b6763fb..2b67b99 160000
--- a/vendor/unity
+++ b/vendor/unity
@@ -1 +1 @@
-Subproject commit b6763fbd9cedfacaa89e2ad9fd00d615a234e355
+Subproject commit 2b67b99a4a87db87ff8c28a3b7e405c3e56d65f0