diff --git a/nav_msgs/SetMap.h b/nav_msgs/SetMap.h
index f829f8c6404b4b25f5cf83ced0360e59c5eca375..db7f04801a1e43aa3ca1d4332d211983dbfa929c 100644
--- a/nav_msgs/SetMap.h
+++ b/nav_msgs/SetMap.h
@@ -4,8 +4,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "ros/msg.h"
-#include "geometry_msgs/PoseWithCovarianceStamped.h"
 #include "nav_msgs/OccupancyGrid.h"
+#include "geometry_msgs/PoseWithCovarianceStamped.h"
 
 namespace nav_msgs
 {
diff --git a/ros/msg.h b/ros/msg.h
index b9f62012b58b2d9de980dbf7bad5533193b34122..9e349c3dac31ef420623baf67de3081150ac053c 100644
--- a/ros/msg.h
+++ b/ros/msg.h
@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <string.h>
+#include <cstring>
 
 namespace ros
 {
@@ -65,7 +65,7 @@ public:
   static int serializeAvrFloat64(unsigned char* outbuffer, const float f)
   {
     int32_t val;
-    memcpy(&val, &f, sizeof(val));
+    std::memcpy(&val, &f, sizeof(val));
 
     int16_t exp = ((val >> 23) & 255);
     uint32_t mantissa = val & 0x7FFFFF;
@@ -179,7 +179,7 @@ public:
     // Copy negative sign.
     val |= (static_cast<uint32_t>(*(inbuffer++)) & 0x80) << 24;
 
-    memcpy(f, &val, sizeof(val));
+    std::memcpy(f, &val, sizeof(val));
     return 8;
   }