This is C++

loolwsd/LOOLSession.cpp

@@ -349,7 +349,7 @@ void LOOLSession::sendTile(const char *buffer, int length, StringTokenizer& toke
     std::vector<char> output;
     output.reserve(4 * width * height);
     output.resize(response.size());
-    memcpy(output.data(), response.data(), response.size());
+    std::memcpy(output.data(), response.data(), response.size());
 
     std::unique_ptr<std::fstream> cachedTile = _tileCache->lookupTile(width, height, tilePosX, tilePosY, tileWidth, tileHeight);
     if (cachedTile && cachedTile->is_open())

loolwsd/Util.cpp

@@ -8,9 +8,8 @@
  */
 
 #include <cstdlib>
-
+#include <cstring>
 #include <string>
-#include <string.h>
 
 #include <png.h>