diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7b3129b
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+/*
+LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2010 Michael Long
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
\ No newline at end of file
diff --git a/buildandtest b/buildandtest
index eb3bc12..b7fecb6 100755
--- a/buildandtest
+++ b/buildandtest
@@ -1,7 +1,8 @@
 #!/bin/bash
 set -e
 
-ruby fakegen.rb > fff.h
+cat LICENSE > fff.h
+ruby fakegen.rb >> fff.h
 make clean
 make all
 build/fff_test_c 
diff --git a/examples/driver_testing/Makefile b/examples/driver_testing/Makefile
index b636a01..e32faaf 100644
--- a/examples/driver_testing/Makefile
+++ b/examples/driver_testing/Makefile
@@ -42,7 +42,7 @@ $(BUILD_DIR)/%.o: %.c
 $(BUILD_DIR)/%.o: %.cpp
 	@echo "Compiling "$@
 	@echo "    CPP       "$<
-	$(CPP) -I../.. -o $@ $< -DTESTING
+	$(CPP) -DGTEST_USE_OWN_TR1_TUPLE=1 -I../.. -o $@ $< -DTESTING
 
 $(TEMPLATE_PROGNAME): $(TEMPLATE_OBJFILES)
 	@echo "Linking "$@
diff --git a/examples/embedded_ui/Makefile b/examples/embedded_ui/Makefile
index 84582c9..654beec 100644
--- a/examples/embedded_ui/Makefile
+++ b/examples/embedded_ui/Makefile
@@ -43,7 +43,7 @@ $(BUILD_DIR)/%.o: %.c
 $(BUILD_DIR)/%.o: %.cpp
 	@echo "Compiling "$@
 	@echo "    CPP       "$<
-	$(CPP) -I../.. -o $@ $< 
+	$(CPP) -DGTEST_USE_OWN_TR1_TUPLE=1 -I../.. -o $@ $< 
 
 $(TEMPLATE_PROGNAME): $(TEMPLATE_OBJFILES)
 	@echo "Linking "$@
diff --git a/fff.h b/fff.h
index d61e860..046cdb4 100644
--- a/fff.h
+++ b/fff.h
@@ -1,4 +1,28 @@
-#ifndef FAKE_FUNCTIONS
+/*
+LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2010 Michael Long
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/#ifndef FAKE_FUNCTIONS
 #define FAKE_FUNCTIONS
 
 #define FFF_MAX_ARGS (20u)
diff --git a/gtest/Makefile b/gtest/Makefile
index 6593c0e..efcfa0b 100644
--- a/gtest/Makefile
+++ b/gtest/Makefile
@@ -10,7 +10,7 @@ SOURCES=gtest-all.cc gtest-main.cc
 $(BUILD_DIR)/%.o: %.cc
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	g++ -I../ -O0 -g3 -Wall -c -o "$@" "$<"
+	g++ -I../ -O0 -g3 -Wall -DGTEST_USE_OWN_TR1_TUPLE=1 -c -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/test/Makefile b/test/Makefile
index 76fc8fc..5c154e2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -32,7 +32,7 @@ all: $(FFF_TEST_CPP_TARGET) $(FFF_TEST_C_TARGET) $(FFF_TEST_GLOBAL_C_TARGET) $(F
 $(BUILD_DIR)/%.o: %.cpp
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'
-	g++ -I../ -O0 -g3 -Wall -c -o "$@" "$<"
+	g++ -I../ -O0 -g3 -Wall -DGTEST_USE_OWN_TR1_TUPLE=1 -c -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '