diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 9448775b14c3..b2275898dfcd 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -73,19 +73,20 @@ __FBSDID("$FreeBSD$");
 #include <sys/wait.h>
 #include <sys/un.h>
 
-#include <ctype.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
+#include <cstdio>
+#include <csignal>
+#include <cstring>
+
 #include <dirent.h>
-#include <errno.h>
 #include <err.h>
 #include <fcntl.h>
 #include <libutil.h>
 #include <paths.h>
 #include <poll.h>
 #include <regex.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <algorithm>