diff --git a/os/access.c b/os/access.c
index fdee9802e..421ed771f 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1,5 +1,5 @@
 /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.4 2004/06/30 20:06:56 kem Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.5 2004/07/17 01:13:31 alanc Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -1739,7 +1739,7 @@ CheckAddr (
 
     switch (family)
     {
-#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN) || defined(MNX_TCPCONN)
+#if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
       case FamilyInternet:
 	if (length == sizeof (struct in_addr))
 	    len = length;
diff --git a/os/connection.c b/os/connection.c
index 930d38528..137ff050d 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -127,12 +127,6 @@ extern __const__ int _nfiles;
 # include <arpa/inet.h>
 #endif
 
-#ifdef AMTCPCONN
-#include <server/ip/types.h>
-#include <server/ip/gen/in.h>
-#include <server/ip/gen/inet.h>
-#endif
-
 #if !defined(__UNIXOS2__)
 #ifndef Lynx
 #include <sys/uio.h>
@@ -516,16 +510,6 @@ AuthAudit (ClientPtr client, Bool letin,
 	    sprintf(out, "DN %s",
 		    dnet_ntoa(&((struct sockaddr_dn *) saddr)->sdn_add));
 	    break;
-#endif
-#ifdef AMRPCCONN
-	case FamilyAmoeba:
-	    sprintf(addr, "AM %s", saddr);
-	    break;
-#endif
-#if defined(AMTCPCONN) && !(defined(TCPCONN) || defined(STREAMSCONN))
-	case AF_INET:
-	    sprintf(addr, "AMIP %s", inet_ntoa(*((ipaddr_t *) saddr)));
-	    break;
 #endif
 	default:
 	    strcpy(out, "unknown address");
@@ -650,13 +634,6 @@ ClientAuthorized(ClientPtr client,
 	    _XSERVTransGetPeerAddr (trans_conn,
 	        &family, &fromlen, &from) != -1)
 	{
-#ifdef AMRPCCONN
-	    /* Amoeba RPC connections are already checked by the capability. */
-	    if (family == FamilyAmoeba) {
-		auth_id = (XID) 0;
-	    }
-	    else
-#endif
 	    if (
 #ifdef LBX
 		!trans_conn ||