  struct MetricNameRef {
  	MetricNameRef() {}
 diff --git a/flow/flow.h b/flow/flow.h
-index 0c220af..f685fbc 100644
+index 0c220afae..f685fbc63 100644
 --- a/flow/flow.h
 +++ b/flow/flow.h
 @@ -248,19 +248,6 @@ public:

\ No newline at end of file
+#endif
diff --git a/fdbrpc/libcoroutine/Coro.c b/fdbrpc/libcoroutine/Coro.c
index cbfdc8f..9993cee 100644
--- a/fdbrpc/libcoroutine/Coro.c
+++ b/fdbrpc/libcoroutine/Coro.c
@@ -66,6 +66,8 @@ VALGRIND_STACK_DEREGISTER((coro)->valgrindStackId)

 ServerKnobs const* SERVER_KNOBS = new ServerKnobs();
 
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index b485a8495..82541d439 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -20,6 +20,7 @@
