diff --git a/src/packaging/FreeBSD/pkg-plist b/src/packaging/FreeBSD/pkg-plist
index afdce82c1d..21f6f26a19 100644
--- a/src/packaging/FreeBSD/pkg-plist
+++ b/src/packaging/FreeBSD/pkg-plist
@@ -136,7 +136,6 @@ include/openafs/afs/volume_inline.h
 include/openafs/afs/salvsync.h
 include/openafs/afs/daemon_com.h
 include/openafs/afs/vsutils_prototypes.h
-include/openafs/afs/afs_assert.h
 include/openafs/des.h
 include/openafs/des_conf.h
 include/openafs/des_odd.h
diff --git a/src/util/thread_pool.c b/src/util/thread_pool.c
index eb89dfba29..deb430b33f 100644
--- a/src/util/thread_pool.c
+++ b/src/util/thread_pool.c
@@ -12,7 +12,6 @@
 
 #include <roken.h>
 
-#include <afs/afs_assert.h>
 #include <lock.h>
 #include <afs/afsutil.h>
 #include <lwp.h>
diff --git a/src/util/work_queue.c b/src/util/work_queue.c
index e523fe1767..e2f1553a28 100644
--- a/src/util/work_queue.c
+++ b/src/util/work_queue.c
@@ -13,7 +13,6 @@
 #include <roken.h>
 #include <sys/file.h>
 
-#include <afs/afs_assert.h>
 #include <lock.h>
 
 #define __AFS_WORK_QUEUE_IMPL 1
diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index ee05a7d576..54ea83d89e 100644
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -94,7 +94,6 @@ ListViceInodes(char *devname, char *mountedOn, FD_t inodeFile,
 #if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV)
 #include <sys/ino.h>
 #endif
-#include <afs/afs_assert.h>
 
 #include "lock.h"
 #include "ihandle.h"
diff --git a/src/vol/test/listVicepx.c b/src/vol/test/listVicepx.c
index fe75420c22..b83433994f 100644
--- a/src/vol/test/listVicepx.c
+++ b/src/vol/test/listVicepx.c
@@ -97,7 +97,6 @@
 #include "volume.h"
 #include "vldb.h"
 #include "partition.h"
-#include "afs/afs_assert.h"
 #include "filesignal.h"
 #include "vutils.h"
 #include "daemon_com.h"
diff --git a/src/vol/test/nicreate.c b/src/vol/test/nicreate.c
index 7863c05f16..10f2f2fab6 100644
--- a/src/vol/test/nicreate.c
+++ b/src/vol/test/nicreate.c
@@ -33,7 +33,6 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/afs_assert.h>
 
 
 char *prog = "nicreate";
diff --git a/src/vol/test/nincdec.c b/src/vol/test/nincdec.c
index 6ad457a5ad..6ea793c483 100644
--- a/src/vol/test/nincdec.c
+++ b/src/vol/test/nincdec.c
@@ -33,7 +33,6 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/afs_assert.h>
 
 
 char *prog = "nincdec";
diff --git a/src/vol/test/nsubr.c b/src/vol/test/nsubr.c
index 1b21fca5ae..ff02b471c6 100644
--- a/src/vol/test/nsubr.c
+++ b/src/vol/test/nsubr.c
@@ -29,7 +29,6 @@
 #include "voldefs.h"
 #include "partition.h"
 #include <dirent.h>
-#include <afs/afs_assert.h>
 
 
 
diff --git a/src/vol/test/updateDirInode.c b/src/vol/test/updateDirInode.c
index 7bac28e516..0853c1f5be 100644
--- a/src/vol/test/updateDirInode.c
+++ b/src/vol/test/updateDirInode.c
@@ -97,7 +97,7 @@
 #include "volume.h"
 #include "vldb.h"
 #include "partition.h"
-#include "afs/afs_assert.h"
+#include "afs/opr_assert.h"
 #include "filesignal.h"
 #include "vutils.h"
 #include "daemon_com.h"