diff --git a/src/name.cpp b/src/name.cpp
index 3e2d1fe..484fdc0 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -8,7 +8,7 @@
 
 #include <stdexcept>
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 #include <ndn-cpp-dev/name.hpp>
 #include "util/time.hpp"
 
@@ -90,7 +90,7 @@
     return 1;
 
   // The components are equal length.  Just do a byte compare.  
-  return memcmp(getValue().buf(), other.getValue().buf(), getValue().size());
+  return std::memcmp(getValue().buf(), other.getValue().buf(), getValue().size());
 }
 
 // const Block &