diff --git a/sys/net/if_llatbl.h b/sys/net/if_llatbl.h
index 693ccd521fad..e09145cce8fc 100644
--- a/sys/net/if_llatbl.h
+++ b/sys/net/if_llatbl.h
@@ -43,7 +43,7 @@ struct rt_addrinfo;
 struct llentry;
 LIST_HEAD(llentries, llentry);
 
-extern struct rwlock lltable_rwlock;
+extern struct rwlock_padalign lltable_rwlock;
 #define	LLTABLE_RLOCK()		rw_rlock(&lltable_rwlock)
 #define	LLTABLE_RUNLOCK()	rw_runlock(&lltable_rwlock)
 #define	LLTABLE_WLOCK()		rw_wlock(&lltable_rwlock)
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index d60d0dee57ab..6b3a4684075a 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -832,7 +832,7 @@ struct ifmultiaddr {
 
 #ifdef _KERNEL
 
-extern	struct rwlock ifnet_rwlock;
+extern	struct rwlock_padalign ifnet_rwlock;
 extern	struct sx ifnet_sxlock;
 
 #define	IFNET_LOCK_INIT() do {						\
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 8657dbb7ed13..bf27652076e6 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -116,7 +116,7 @@ VNET_DECLARE(u_long, in_ifaddrhmask);		/* mask for hash table */
 #define INADDR_HASH(x) \
 	(&V_in_ifaddrhashtbl[INADDR_HASHVAL(x) & V_in_ifaddrhmask])
 
-extern	struct rwlock in_ifaddr_lock;
+extern	struct rwlock_padalign in_ifaddr_lock;
 
 #define	IN_IFADDR_LOCK_ASSERT()	rw_assert(&in_ifaddr_lock, RA_LOCKED)
 #define	IN_IFADDR_RLOCK()	rw_rlock(&in_ifaddr_lock)
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 77f31df336a7..f49c31f015a8 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -133,7 +133,7 @@ struct socket {
  * avoid defining a lock order between listen and accept sockets
  * until such time as it proves to be a good idea.
  */
-extern struct mtx accept_mtx;
+extern struct mtx_padalign accept_mtx;
 #define	ACCEPT_LOCK_ASSERT()		mtx_assert(&accept_mtx, MA_OWNED)
 #define	ACCEPT_UNLOCK_ASSERT()		mtx_assert(&accept_mtx, MA_NOTOWNED)
 #define	ACCEPT_LOCK()			mtx_lock(&accept_mtx)