diff --git a/Makefile b/Makefile
index 60c922a..032035a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,2 @@
 all:
-	clang++ -Wall -Werror -g -O0 -o loader_test test.cc && ./loader_test face3d.gltf
-
-beautify:
-	~/local/clang+llvm-3.6.0-x86_64-apple-darwin/bin/clang-format -i tiny_gltf_loader.h
+	g++ -Wall -Werror -g -O2 -o loader_test test.cc
diff --git a/examples/glview/glview.cc b/examples/glview/glview.cc
index 42a0b08..1ab9817 100644
--- a/examples/glview/glview.cc
+++ b/examples/glview/glview.cc
@@ -9,12 +9,7 @@
 
 #include <GL/glew.h>
 
-#ifdef __APPLE__
-#include <OpenGL/glu.h>
-#else
-#include <GL/glu.h>
-#endif
-
+#define GLFW_INCLUDE_GLU
 #include <GLFW/glfw3.h>
 
 #include "trackball.h"