diff --git a/include/_tail_cc/sys/.distr b/include/_tail_cc/sys/.distr
index 5ab3e42a..2581952e 100644
--- a/include/_tail_cc/sys/.distr
+++ b/include/_tail_cc/sys/.distr
@@ -1,3 +1,4 @@
 dir.h
 stat.h
 types.h
+stdtypes.h
diff --git a/include/_tail_cc/sys/stdtypes.h b/include/_tail_cc/sys/stdtypes.h
new file mode 100644
index 00000000..0ceb0149
--- /dev/null
+++ b/include/_tail_cc/sys/stdtypes.h
@@ -0,0 +1,14 @@
+/* $Header$ */
+
+/* This include file exists so that <sys/types.h> can still safely be
+   included. On a SUN, this would cause problems because sometimes time_t
+   and/or size_t were defined twice.
+*/
+
+#ifndef	__STDTYPES_H__
+#define	__STDTYPES_H__
+
+typedef	long	time_t;
+typedef	long	size_t;
+
+#endif	/* __STDTYPES_H__ */
diff --git a/include/_tail_cc/sys/types.h b/include/_tail_cc/sys/types.h
index ed79833a..b4c35dd3 100644
--- a/include/_tail_cc/sys/types.h
+++ b/include/_tail_cc/sys/types.h
@@ -34,8 +34,9 @@ typedef	u_long ino_t;
 typedef	u_short ino_t;
 #endif
 typedef	long	swblk_t;
-typedef	long	size_t;
-typedef	long	time_t;
+
+#include <sys/stdtypes.h>
+
 typedef	long	label_t[14];
 typedef	short	dev_t;
 typedef	long	off_t;
diff --git a/include/_tail_mon/sys/types.h b/include/_tail_mon/sys/types.h
index ed79833a..b4c35dd3 100644
--- a/include/_tail_mon/sys/types.h
+++ b/include/_tail_mon/sys/types.h
@@ -34,8 +34,9 @@ typedef	u_long ino_t;
 typedef	u_short ino_t;
 #endif
 typedef	long	swblk_t;
-typedef	long	size_t;
-typedef	long	time_t;
+
+#include <sys/stdtypes.h>
+
 typedef	long	label_t[14];
 typedef	short	dev_t;
 typedef	long	off_t;