--- include/linux/socket.h.mps	2004-11-07 21:54:41.000000000 +0100
+++ include/linux/socket.h	2004-11-07 21:56:06.000000000 +0100
@@ -16,7 +16,7 @@
 				/* _SS_MAXSIZE value minus size of ss_family */
 } __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if defined(__KERNEL__) || ((!defined(__GLIBC__) || (__GLIBC__ < 2)) && !defined(__UCLIBC__))
 
 #include <asm/socket.h>			/* arch-dependent defines	*/
 #include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/
--- include/linux/stat.h.mps	2004-11-07 21:56:14.000000000 +0100
+++ include/linux/stat.h	2004-11-07 21:56:32.000000000 +0100
@@ -7,7 +7,7 @@
 
 #endif
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if defined(__KERNEL__) || ((!defined(__GLIBC__) || (__GLIBC__ < 2)) && !defined(__UCLIBC__))
 
 #define S_IFMT  00170000
 #define S_IFSOCK 0140000
--- include/linux/coda.h.mps	2004-11-07 21:57:16.000000000 +0100
+++ include/linux/coda.h	2004-11-07 21:58:09.000000000 +0100
@@ -101,7 +101,7 @@
 #if defined(__linux__)
 #define cdev_t u_quad_t
 #ifndef __KERNEL__
-#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
+#if !defined(_UQUAD_T_) && ((!defined(__GLIBC__) || __GLIBC__ < 2) && !defined(__UCLIBC__))
 #define _UQUAD_T_ 1
 typedef unsigned long long u_quad_t;
 #endif