diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index 63172a830eaa..61d78425f08d 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -1,7 +1,7 @@
 PROG=	truss
 SRCS=	main.c setup.c i386-fbsd.c i386-linux.c \
 	syscalls.c linux_syscalls.h syscalls.h ioctl.c
-CFLAGS+= -I${.CURDIR} -I.
+CFLAGS+= -I${.CURDIR} -I. -I${.CUDIR}/../../sys
 CLEANFILES+=i386l-syscalls.master syscalls.master linux_syscalls.h \
 	syscalls.h ioctl.c
 
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index e141e2c209ba..1686e58bf6ee 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: i386-fbsd.c,v 1.3 1998/01/05 07:30:24 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -51,8 +51,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
+#include <i386/include/reg.h>
+#include <i386/include/psl.h>
 #include <sys/syscall.h>
 
 #include "syscall.h"
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 0cb7c22302af..4a2421eb877e 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: i386-linux.c,v 1.3 1998/01/05 07:30:25 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -49,8 +49,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
+#include <i386/include/reg.h>
+#include <i386/include/psl.h>
 
 #include "syscall.h"
 
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index e141e2c209ba..1686e58bf6ee 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: i386-fbsd.c,v 1.3 1998/01/05 07:30:24 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -51,8 +51,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
+#include <i386/include/reg.h>
+#include <i386/include/psl.h>
 #include <sys/syscall.h>
 
 #include "syscall.h"
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 0cb7c22302af..4a2421eb877e 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: i386-linux.c,v 1.3 1998/01/05 07:30:25 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -49,8 +49,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
+#include <i386/include/reg.h>
+#include <i386/include/psl.h>
 
 #include "syscall.h"