diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index 03b198bd65..5db786c64e 100644
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -17,7 +17,7 @@
 
 #include <isc/buffer.h>
 #include <isc/mem.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 2fdd36b8b1..349face0bc 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -20,7 +20,7 @@
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/stats.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <dns/acl.h>
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index a5949999e2..99619a3d6a 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -32,7 +32,7 @@
 #include <isc/random.h>
 #include <isc/result.h>
 #include <isc/stats.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/task.h>
 #include <isc/util.h>
 
diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index b913cd3f14..d9e998bda1 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -19,7 +19,7 @@
 #include <isc/netaddr.h>
 #include <isc/print.h>
 #include <isc/result.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/task.h>
 #include <isc/util.h>
 
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index 324b4efc53..901e709fb2 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -20,7 +20,7 @@
 #include <isc/refcount.h>
 #include <isc/result.h>
 #include <isc/rwlock.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <dns/dnssec.h>
diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index d370c19d2f..1cb7fed8fc 100644
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -18,7 +18,7 @@
 #include <isc/mem.h>
 #include <isc/netaddr.h>
 #include <isc/result.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/task.h>
 #include <isc/util.h>
 
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 21ceaef0d3..afb5959bef 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -25,7 +25,7 @@
 #include <isc/mem.h>
 #include <isc/print.h>
 #include <isc/result.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/utf8.h>
 #include <isc/util.h>
 
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index cf0e46be9d..9aed0ad4f1 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -19,7 +19,7 @@
 #include <isc/mem.h>
 #include <isc/region.h>
 #include <isc/result.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <dns/rdata.h>
diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index 856b718c7c..627104c7f3 100644
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -17,7 +17,7 @@
 
 #include <isc/buffer.h>
 #include <isc/result.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <dns/callbacks.h>
diff --git a/lib/dns/time.c b/lib/dns/time.c
index d110ace2e9..38302710b4 100644
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -23,7 +23,7 @@
 #include <isc/result.h>
 #include <isc/serial.h>
 #include <isc/stdtime.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <dns/time.h>
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 4daf3bdff0..6f61c28194 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -23,7 +23,7 @@
 #include <isc/refcount.h>
 #include <isc/result.h>
 #include <isc/serial.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/time.h>
 #include <isc/util.h>
 
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 68e1d44bf9..3a08d42367 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -29,7 +29,7 @@
 #include <isc/print.h>
 #include <isc/result.h>
 #include <isc/stats.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/task.h>
 #include <isc/util.h>
 
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 2f587f81f9..eb9683a7ea 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -21,7 +21,7 @@
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/result.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <dns/callbacks.h>
diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 716ffe6cee..752a20a434 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -17,7 +17,7 @@
 
 #include <isc/mem.h>
 #include <isc/print.h>
-#include <isc/string.h> /* Required for HP/UX (and others?) */
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <dns/acl.h>