From 48acf9c2d71ccd34ab7a95a8593a1689131fc032 Mon Sep 17 00:00:00 2001
From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Fri, 14 Mar 2003 19:47:35 +0000
Subject: [PATCH] winnt-include-sanity-20030314

FIXES 1332

include headers by their usual name instead of trying to be special
---
 src/WINNT/afsd/cm_conn.c  | 2 +-
 src/WINNT/afsd/cm_ioctl.c | 2 +-
 src/WINNT/afsd/cm_rpc.c   | 2 +-
 src/libacl/aclprocs.c     | 2 +-
 src/libacl/netprocs.c     | 2 +-
 src/rx/rx.c               | 2 +-
 src/rx/rx_pthread.c       | 4 ++--
 src/util/secutil_nt.c     | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 3b326022e3..f38d6f6f8f 100644
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -18,7 +18,7 @@
 #include <osi.h>
 #include <rx/rx.h>
 #ifndef DJGPP
-#include <rxkad.h>
+#include <rx/rxkad.h>
 #else
 #include <rx/rxkad.h>
 #endif
diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c
index 51ba32c203..ac51257015 100644
--- a/src/WINNT/afsd/cm_ioctl.c
+++ b/src/WINNT/afsd/cm_ioctl.c
@@ -30,7 +30,7 @@
 #include "smb.h"
 
 #ifndef DJGPP
-#include <rxkad.h>
+#include <rx/rxkad.h>
 #include "afsrpc.h"
 #else
 #include <rx/rxkad.h>
diff --git a/src/WINNT/afsd/cm_rpc.c b/src/WINNT/afsd/cm_rpc.c
index 1c250caf96..882e056a6f 100644
--- a/src/WINNT/afsd/cm_rpc.c
+++ b/src/WINNT/afsd/cm_rpc.c
@@ -26,7 +26,7 @@
 
 #include "smb.h"
 
-#include <rxkad.h>
+#include <rx/rxkad.h>
 
 /*
  * The motivation for this whole module is that in transmitting tokens
diff --git a/src/libacl/aclprocs.c b/src/libacl/aclprocs.c
index cb955ea9c7..33fd15eb16 100644
--- a/src/libacl/aclprocs.c
+++ b/src/libacl/aclprocs.c
@@ -29,7 +29,7 @@ RCSID("$Header$");
 #endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <ptclient.h>
+#include <afs/ptclient.h>
 #include "acl.h"
 
 #ifdef AFS_PTHREAD_ENV
diff --git a/src/libacl/netprocs.c b/src/libacl/netprocs.c
index 62f118e606..c8ef607a1e 100644
--- a/src/libacl/netprocs.c
+++ b/src/libacl/netprocs.c
@@ -26,7 +26,7 @@ RCSID("$Header$");
 #endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <ptclient.h>
+#include <afs/ptclient.h>
 #include "acl.h"
 
 int acl_HtonACL(acl)
diff --git a/src/rx/rx.c b/src/rx/rx.c
index e9a345c330..27f47c5183 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -79,7 +79,7 @@ extern afs_int32 afs_termState;
 #ifdef AFS_NT40_ENV
 # include <stdlib.h>
 # include <fcntl.h>
-# include <afsutil.h>
+# include <afs/afsutil.h>
 #else
 # include <sys/socket.h>
 # include <sys/file.h>
diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c
index dbf6b9bdda..43d566918a 100644
--- a/src/rx/rx_pthread.c
+++ b/src/rx/rx_pthread.c
@@ -33,8 +33,8 @@ RCSID("$Header$");
 # include <sys/time.h>
 #endif
 #include <sys/stat.h>
-#include <rx.h>
-#include <rx_globals.h>
+#include <rx/rx.h>
+#include <rx/rx_globals.h>
 #include <assert.h>
 #include <rx/rx_pthread.h>
 
diff --git a/src/util/secutil_nt.c b/src/util/secutil_nt.c
index 3d79128048..405c907a2f 100644
--- a/src/util/secutil_nt.c
+++ b/src/util/secutil_nt.c
@@ -9,12 +9,12 @@
 
 /* Security related utilities for the Windows platform */
 
-#include <param.h>
+#include <afs/param.h>
 #include <afsconfig.h>
 
 RCSID("$Header$");
 
-#include <stds.h>
+#include <afs/stds.h>
 
 #include <stddef.h>
 #include <stdlib.h>