diff --git a/libexec/bootpd/bootp.h b/libexec/bootpd/bootp.h
index 6ff568087511..479dd3b9e055 100644
--- a/libexec/bootpd/bootp.h
+++ b/libexec/bootpd/bootp.h
@@ -44,7 +44,7 @@ struct bootp {
     unsigned char    bp_htype;			/* hardware addr type */
     unsigned char    bp_hlen;			/* hardware addr length */
     unsigned char    bp_hops;			/* gateway hops */
-    unsigned int32   bp_xid;			/* transaction ID */
+    u_int32	     bp_xid;			/* transaction ID */
     unsigned short   bp_secs;			/* seconds since boot began */
     unsigned short   bp_flags;			/* RFC1532 broadcast, etc. */
     struct in_addr   bp_ciaddr;			/* client IP address */
@@ -133,7 +133,7 @@ struct bootp {
 
 struct cmu_vend {
 	char		v_magic[4];	/* magic number */
-	unsigned int32	v_flags;	/* flags/opcodes, etc. */
+	u_int32		v_flags;	/* flags/opcodes, etc. */
 	struct in_addr 	v_smask;	/* Subnet mask */
 	struct in_addr 	v_dgate;	/* Default gateway */
 	struct in_addr	v_dns1, v_dns2; /* Domain name servers */
diff --git a/libexec/bootpd/bootpd.h b/libexec/bootpd/bootpd.h
index e5ce3417c04e..86c1b3da8b64 100644
--- a/libexec/bootpd/bootpd.h
+++ b/libexec/bootpd/bootpd.h
@@ -23,6 +23,8 @@ SOFTWARE.
 
 /*
  * bootpd.h -- common header file for all the modules of the bootpd program.
+ *
+ * $FreeBSD$
  */
 
 #include "bptypes.h"
@@ -181,7 +183,7 @@ struct host {
 				       RFC951 only allocates 1 byte. . . */
 			    haddr[MAXHADDRLEN];
     int32		    time_offset;
-    unsigned int32	    bootsize,
+    u_int32		    bootsize,
 			    msg_size,
 			    min_wait;
     struct in_addr	    bootserver,
diff --git a/libexec/bootpd/bptypes.h b/libexec/bootpd/bptypes.h
index 537da4e5e57f..e27cc832c5fe 100644
--- a/libexec/bootpd/bptypes.h
+++ b/libexec/bootpd/bptypes.h
@@ -1,16 +1,17 @@
-/* bptypes.h */
+/* $FreeBSD$
+ */
 
 #ifndef	BPTYPES_H
 #define	BPTYPES_H
 
+#include <sys/types.h>
+
 /*
  * 32 bit integers are different types on various architectures
  */
 
-#ifndef	int32
-#define int32 long
-#endif
-typedef unsigned int32 u_int32;
+#define	int32	int32_t
+#define	u_int32	u_int32_t
 
 /*
  * Nice typedefs. . .
@@ -19,5 +20,4 @@ typedef unsigned int32 u_int32;
 typedef int boolean;
 typedef unsigned char byte;
 
-
 #endif	/* BPTYPES_H */