Index: sys/arch/powerpc/include/types.h
===================================================================
RCS file: /export/20070724ts/Repository/src/sys/arch/powerpc/include/types.h,v
retrieving revision 1.2
diff -u -r1.2 types.h
--- sys/arch/powerpc/include/types.h	15 Aug 2007 09:46:30 -0000	1.2
+++ sys/arch/powerpc/include/types.h	16 Aug 2007 02:39:28 -0000
@@ -40,9 +40,12 @@
 
 #if defined(_KERNEL) || defined(_STANDALONE)
 #ifndef IPFILTER_LKM
+#ifndef CADDR_T_DEFINED
+#define CADDR_T_DEFINED
 typedef char *caddr_t;		/* core address */
 #endif
 #endif
+#endif
 
 #ifdef _KERNEL
 typedef struct label_t {
Index: sys/dist/ipf/netinet/ip_compat.h
===================================================================
RCS file: /export/20070724ts/Repository/src/sys/dist/ipf/netinet/ip_compat.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ip_compat.h
--- sys/dist/ipf/netinet/ip_compat.h	15 Aug 2007 09:11:07 -0000	1.1.1.1
+++ sys/dist/ipf/netinet/ip_compat.h	16 Aug 2007 02:38:39 -0000
@@ -736,7 +736,10 @@
 
 # ifdef _KERNEL
 # if (__NetBSD_Version__ >= 499000000)
+#ifndef CADDR_T_DEFINED
+#define CADDR_T_DEFINED
 typedef	char *	caddr_t;
+#endif
 # endif
 #  if (__NetBSD_Version__ >= 399001400)
 #   define	KMALLOCS(a, b, c)	(a) = (b)malloc((c), _M_IPF, M_NOWAIT)