diff --git a/bazaar/GoogleMockExample/GoogleMockExample.upp b/bazaar/GoogleMockExample/GoogleMockExample.upp
index 3e5e6dd37..22733524a 100644
--- a/bazaar/GoogleMockExample/GoogleMockExample.upp
+++ b/bazaar/GoogleMockExample/GoogleMockExample.upp
@@ -1,3 +1,5 @@
+description "Unit test package that shows how to use Google Test with Google Mock\377";
+
 uses
 	Core,
 	plugin/gmock;
@@ -5,3 +7,6 @@ uses
 file
 	GoogleMockExample.cpp;
 
+mainconfig
+	"" = "";
+
diff --git a/bazaar/plugin/gtest/gtest-port.cc b/bazaar/plugin/gtest/gtest-port.cc
index 48d140fa7..9d884d947 100644
--- a/bazaar/plugin/gtest/gtest-port.cc
+++ b/bazaar/plugin/gtest/gtest-port.cc
@@ -31,8 +31,6 @@
 
 #include "internal/gtest-port.h"
 
-#include <Core/Core.h>
-
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -79,6 +77,8 @@
 #include "gtest-internal-inl.h"
 #undef GTEST_IMPLEMENTATION_
 
+#include <Core/Core.h>
+
 namespace testing {
 namespace internal {