diff --git a/include/grpc++/config.h b/include/grpc++/config.h
index 1362c0a1fa81adeeaa6704a32438907c5a6f81d3..889dc39eb7b3899e271ddf38196a19d95a451eb4 100644
--- a/include/grpc++/config.h
+++ b/include/grpc++/config.h
@@ -79,6 +79,7 @@
 
 #ifdef GRPC_CXX0X_NO_NULLPTR
 #include <memory>
+namespace grpc {
 const class {
  public:
   template <class T>
@@ -98,6 +99,7 @@ const class {
  private:
   void operator&() const = delete;
 } nullptr = {};
+}
 #endif
 
 #ifndef GRPC_CUSTOM_STRING
diff --git a/test/cpp/qps/timer.cc b/test/cpp/qps/timer.cc
index 07289f699bf554c40f26af50b2c53a2ab9ac515f..c1ba23decd961fe6b5f5ecc7958e9784175218db 100644
--- a/test/cpp/qps/timer.cc
+++ b/test/cpp/qps/timer.cc
@@ -52,7 +52,7 @@ static double time_double(struct timeval* tv) {
 Timer::Result Timer::Sample() {
   struct rusage usage;
   struct timeval tv;
-  gettimeofday(&tv, nullptr);
+  gettimeofday(&tv, NULL);
   getrusage(RUSAGE_SELF, &usage);
 
   Result r;