diff --git a/src/net/HostParser.cxx b/src/net/HostParser.cxx
index 19e13ca10..ed4f77d85 100644
--- a/src/net/HostParser.cxx
+++ b/src/net/HostParser.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2018 Content Management AG
+ * Copyright 2007-2020 CM4all GmbH
  * All rights reserved.
  *
  * author: Max Kellermann <mk@cm4all.com>
@@ -33,7 +33,7 @@
 #include "HostParser.hxx"
 #include "util/CharUtil.hxx"
 
-#include <string.h>
+#include <cstring>
 
 static inline bool
 IsValidHostnameChar(char ch) noexcept
diff --git a/src/net/HostParser.hxx b/src/net/HostParser.hxx
index 594bd24f3..c7d3b8275 100644
--- a/src/net/HostParser.hxx
+++ b/src/net/HostParser.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2018 Content Management AG
+ * Copyright 2007-2020 CM4all GmbH
  * All rights reserved.
  *
  * author: Max Kellermann <mk@cm4all.com>
diff --git a/src/net/Resolver.cxx b/src/net/Resolver.cxx
index b513b5a79..447aaaf82 100644
--- a/src/net/Resolver.cxx
+++ b/src/net/Resolver.cxx
@@ -45,8 +45,8 @@
 #endif
 
 #include <cerrno>
+#include <cstring>
 
-#include <string.h>
 #include <stdio.h>
 
 static inline bool
diff --git a/src/net/Resolver.hxx b/src/net/Resolver.hxx
index bd427cdda..b92970d01 100644
--- a/src/net/Resolver.hxx
+++ b/src/net/Resolver.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2018 Content Management AG
+ * Copyright 2007-2020 CM4all GmbH
  * All rights reserved.
  *
  * author: Max Kellermann <mk@cm4all.com>