diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 343949edc596..2e1e9382e741 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -34,6 +34,7 @@ SUBDIR=	ac \
 	cron \
 	crunch \
 	ctm \
+	cxgbtool \
 	daemon \
 	dconschat \
 	devinfo \
diff --git a/usr.sbin/cxgbtool/cxgbtool.c b/usr.sbin/cxgbtool/cxgbtool.c
index fac31d002af0..6c5effa89702 100644
--- a/usr.sbin/cxgbtool/cxgbtool.c
+++ b/usr.sbin/cxgbtool/cxgbtool.c
@@ -64,8 +64,8 @@ __FBSDID("$FreeBSD$");
 #define PROTO_SRAM_SIZE (PROTO_SRAM_LINE_NIBBLES * PROTO_SRAM_LINES / 2)
 #define PROTO_SRAM_EEPROM_ADDR 4096
 
-#include <cxgb3_ioctl.h>
-#include <common/cxgb3_regs.h>
+#include <cxgb_ioctl.h>
+#include <common/cxgb_regs.h>
 #include "version.h"
 
 struct reg_info {