diff --git a/lmdb-safe.cc b/lmdb-safe.cc
index 530389a..f9d7bd9 100644
--- a/lmdb-safe.cc
+++ b/lmdb-safe.cc
@@ -1,9 +1,11 @@
 #include "lmdb-safe.hh"
+
 #include <fcntl.h>
+#include <sys/stat.h>
+
 #include <mutex>
 #include <memory>
-#include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 #include <map>
 
 using namespace std;
diff --git a/lmdb-safe.hh b/lmdb-safe.hh
index c34b542..5e61929 100644
--- a/lmdb-safe.hh
+++ b/lmdb-safe.hh
@@ -1,5 +1,7 @@
 #pragma once
+
 #include <lmdb.h>
+
 #include <iostream>
 #include <fstream>
 #include <set>
@@ -7,7 +9,7 @@
 #include <thread>
 #include <memory>
 #include <string>
-#include <string.h>
+#include <cstring>
 #include <mutex>
 #include <vector>
 #include <algorithm>
diff --git a/lmdb-various.cc b/lmdb-various.cc
index 7377e33..48da386 100644
--- a/lmdb-various.cc
+++ b/lmdb-various.cc
@@ -1,10 +1,13 @@
-#include <arpa/inet.h>
-#include <atomic>
-#include <string.h>
 #include "lmdb-safe.hh"
+
+#include <arpa/inet.h>
 #include <unistd.h>
+
+#include <atomic>
+#include <cstring>
 #include <thread>
 #include <vector>
+
 using namespace std;
 
 static void closeTest()
diff --git a/lmdb-view.cc b/lmdb-view.cc
index d3af23f..480ea1a 100644
--- a/lmdb-view.cc
+++ b/lmdb-view.cc
@@ -1,4 +1,5 @@
 #include "lmdb-safe.hh"
+
 #include <iostream>
 
 using namespace std;
diff --git a/rel-example.cc b/rel-example.cc
index 9754a31..b3ead55 100644
--- a/rel-example.cc
+++ b/rel-example.cc
@@ -1,7 +1,10 @@
 #include "lmdb-safe.hh"
-#include <sstream>
+
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
+
+#include <sstream>
+
 using namespace std;
 
 struct Record
diff --git a/resize-example.cc b/resize-example.cc
index fbd9993..f3e68ee 100644
--- a/resize-example.cc
+++ b/resize-example.cc
@@ -1,5 +1,7 @@
 #include "lmdb-safe.hh"
-#include <string.h>
+
+#include <cstring>
+
 using namespace std;
 
 int main(int argc, char** argv)
diff --git a/test-basic.cc b/test-basic.cc
index c5c86ed..587203b 100644
--- a/test-basic.cc
+++ b/test-basic.cc
@@ -1,8 +1,8 @@
 #define CATCH_CONFIG_MAIN
+#include "lmdb-safe.hh"
+#include "catch2/catch.hpp"
 
 #include <iostream>
-#include "catch2/catch.hpp"
-#include "lmdb-safe.hh"
 
 using namespace std;
 
diff --git a/typed-example.cc b/typed-example.cc
index 4c84867..8f24fb5 100644
--- a/typed-example.cc
+++ b/typed-example.cc
@@ -1,7 +1,9 @@
 #include "lmdb-typed.hh"
+
 #include <arpa/inet.h>
 
 #include <string>
+
 using namespace std;
 
 struct DNSResourceRecord
diff --git a/typed-test.cc b/typed-test.cc
index 3517500..be6a4fa 100644
--- a/typed-test.cc
+++ b/typed-test.cc
@@ -1,7 +1,9 @@
-#include <iostream>
-#include <time.h>
-#include "catch2/catch.hpp"
 #include "lmdb-typed.hh"
+#include "catch2/catch.hpp"
+
+#include <time.h>
+
+#include <iostream>
 
 using namespace std;