diff --git a/Makefile b/Makefile
index 24c482c..c7e9468 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ EXPAND = lib/tmpl/expand
 
 CFLAGS := -g -Wall -pthread -iquote.obj/gen -Wno-uninitialized -O2 -DNASSERT
 #CFLAGS := -g -Wall -pthread -iquote.obj/gen -Wno-uninitialized 
-CXXFLAGS := -g -std=c++0x
+CXXFLAGS := -g
 LDFLAGS := -levent_pthreads
 ## Debian package: check
 #CHECK_CFLAGS := $(shell pkg-config --cflags check)
diff --git a/lockserver/Rules.mk b/lockserver/Rules.mk
index 6ae59ff..2778677 100644
--- a/lockserver/Rules.mk
+++ b/lockserver/Rules.mk
@@ -27,8 +27,7 @@ $(d)lockserver-repl: $(o)lockserver-repl.o \
 	$(OBJS-ir-client) \
 	$(LIB-configuration) \
 	$(LIB-repltransport) \
-   	$(LIB-store-common) \
-	$(GTEST_MAIN)
+   	$(LIB-store-common)
 
 BINS += $(d)server-main $(d)client-main $(d)lockserver-repl
 
diff --git a/store/common/tracer.h b/store/common/tracer.h
index 3da22de..b5e295d 100644
--- a/store/common/tracer.h
+++ b/store/common/tracer.h
@@ -12,6 +12,7 @@
 #include <sys/time.h>
 #include <map>
 #include <string>
+#include <cstdint>
 
 /* Trace details of an individual type of request. */
 typedef struct Request_Trace