diff --git a/mozilla/network/cache/mkcache.c b/mozilla/network/cache/mkcache.c
index c4b64ad32dc..f38c97318ef 100644
--- a/mozilla/network/cache/mkcache.c
+++ b/mozilla/network/cache/mkcache.c
@@ -3085,7 +3085,7 @@ NET_WriteCacheFAT(char *filename, XP_Bool final_call)
 {
 #ifdef NU_CACHE
     PR_ASSERT(0);
-#endif;
+#endif
 	net_StoreDiskCacheSize();
 
 	if(!cache_database)
diff --git a/mozilla/network/main/mkconect.c b/mozilla/network/main/mkconect.c
index 6031a324ae4..1b086e671f6 100644
--- a/mozilla/network/main/mkconect.c
+++ b/mozilla/network/main/mkconect.c
@@ -78,7 +78,7 @@
 
 #include <resolv.h>
 
-#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX)
+#if defined(HAVE_SYS_FILIO_H)
 #include <sys/filio.h>
 #endif
 
diff --git a/mozilla/network/main/mksockrw.c b/mozilla/network/main/mksockrw.c
index 936e14f200f..ed8770e2f61 100644
--- a/mozilla/network/main/mksockrw.c
+++ b/mozilla/network/main/mksockrw.c
@@ -47,7 +47,7 @@ extern int XP_ERRNO_EWOULDBLOCK;
 
 #include <resolv.h>
 
-#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX)
+#if defined(HAVE_SYS_FILIO_H)
 #include <sys/filio.h>
 #endif
 
diff --git a/mozilla/network/main/mktrace.c b/mozilla/network/main/mktrace.c
index 2dfb6fde2c8..c6465fa649e 100644
--- a/mozilla/network/main/mktrace.c
+++ b/mozilla/network/main/mktrace.c
@@ -78,7 +78,7 @@ void NET_NTrace(char *msg, int32 length) {
 
 
 /* #define'd in mktrace.h to TRACEMSG */
-void _MK_TraceMsg(char *fmt, ...) {
+void ns_MK_TraceMsg(char *fmt, ...) {
 	va_list ap;
 	char buf[512];
 
diff --git a/mozilla/network/main/mktrace.h b/mozilla/network/main/mktrace.h
index 064464144fc..df5b78f119f 100644
--- a/mozilla/network/main/mktrace.h
+++ b/mozilla/network/main/mktrace.h
@@ -36,10 +36,10 @@ extern PRLogModuleInfo* NETLIB;
 
 PR_BEGIN_EXTERN_C
 extern void NET_NTrace(char *msg, int32 length);
-extern void _MK_TraceMsg(char *fmt, ...);
+extern void ns_MK_TraceMsg(char *fmt, ...);
 PR_END_EXTERN_C
 
-#define TRACEMSG(msg)  _MK_TraceMsg msg
+#define TRACEMSG(msg)  ns_MK_TraceMsg msg
 #else
 #define TRACEMSG(msg)  
 #endif /* DEBUG || NETLIB_TRACE_ON */
diff --git a/mozilla/network/protocol/ftp/mkftp.c b/mozilla/network/protocol/ftp/mkftp.c
index 2267b373bca..3ea2276285d 100644
--- a/mozilla/network/protocol/ftp/mkftp.c
+++ b/mozilla/network/protocol/ftp/mkftp.c
@@ -65,7 +65,7 @@
 #endif /* XP_OS2 */
 
 #ifdef XP_UNIX
-#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX)
+#if defined(HAVE_SYS_FILIO_H)
 #include <sys/filio.h>
 #endif
 #endif /* XP_UNIX */ 
diff --git a/mozilla/xpcom/base/nsCOMPtr.h b/mozilla/xpcom/base/nsCOMPtr.h
index 0633b1f2acc..2f7b0c0c0a3 100644
--- a/mozilla/xpcom/base/nsCOMPtr.h
+++ b/mozilla/xpcom/base/nsCOMPtr.h
@@ -272,7 +272,7 @@
   #endif
 #endif
 
-#if defined(IRIX)
+#if defined(IRIX) || defined(AIX)
   #define NSCAP_NO_MEMBER_USING_DECLARATIONS
   #define NSCAP_NO_EXPLICIT
   #define NSCAP_NO_NEW_CASTS
diff --git a/mozilla/xpcom/base/nsDebug.cpp b/mozilla/xpcom/base/nsDebug.cpp
index 010d4c92c26..3580c0e3b6d 100644
--- a/mozilla/xpcom/base/nsDebug.cpp
+++ b/mozilla/xpcom/base/nsDebug.cpp
@@ -57,6 +57,8 @@
 	   }
    #endif // TEMP_MAC_HACK
    //------------------------
+#elif defined(XP_UNIX)
+#include<stdlib.h>
 #endif
 
 
diff --git a/mozilla/xpcom/glue/nsCOMPtr.h b/mozilla/xpcom/glue/nsCOMPtr.h
index 0633b1f2acc..2f7b0c0c0a3 100644
--- a/mozilla/xpcom/glue/nsCOMPtr.h
+++ b/mozilla/xpcom/glue/nsCOMPtr.h
@@ -272,7 +272,7 @@
   #endif
 #endif
 
-#if defined(IRIX)
+#if defined(IRIX) || defined(AIX)
   #define NSCAP_NO_MEMBER_USING_DECLARATIONS
   #define NSCAP_NO_EXPLICIT
   #define NSCAP_NO_NEW_CASTS
diff --git a/mozilla/xpcom/glue/nsDebug.cpp b/mozilla/xpcom/glue/nsDebug.cpp
index 010d4c92c26..3580c0e3b6d 100644
--- a/mozilla/xpcom/glue/nsDebug.cpp
+++ b/mozilla/xpcom/glue/nsDebug.cpp
@@ -57,6 +57,8 @@
 	   }
    #endif // TEMP_MAC_HACK
    //------------------------
+#elif defined(XP_UNIX)
+#include<stdlib.h>
 #endif
 
 
diff --git a/mozilla/xpcom/public/nsCOMPtr.h b/mozilla/xpcom/public/nsCOMPtr.h
index 0633b1f2acc..2f7b0c0c0a3 100644
--- a/mozilla/xpcom/public/nsCOMPtr.h
+++ b/mozilla/xpcom/public/nsCOMPtr.h
@@ -272,7 +272,7 @@
   #endif
 #endif
 
-#if defined(IRIX)
+#if defined(IRIX) || defined(AIX)
   #define NSCAP_NO_MEMBER_USING_DECLARATIONS
   #define NSCAP_NO_EXPLICIT
   #define NSCAP_NO_NEW_CASTS
diff --git a/mozilla/xpcom/src/nsDebug.cpp b/mozilla/xpcom/src/nsDebug.cpp
index 010d4c92c26..3580c0e3b6d 100644
--- a/mozilla/xpcom/src/nsDebug.cpp
+++ b/mozilla/xpcom/src/nsDebug.cpp
@@ -57,6 +57,8 @@
 	   }
    #endif // TEMP_MAC_HACK
    //------------------------
+#elif defined(XP_UNIX)
+#include<stdlib.h>
 #endif