From dfa6f7b2487560844403f005a7c88de490e68a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sat, 7 Oct 2006 22:16:04 +0000
Subject: [PATCH] reference all include files using krb5/

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18334 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/gssapi/krb5/8003.c                       | 2 +-
 lib/gssapi/krb5/accept_sec_context.c         | 2 +-
 lib/gssapi/krb5/acquire_cred.c               | 2 +-
 lib/gssapi/krb5/add_cred.c                   | 2 +-
 lib/gssapi/krb5/add_oid_set_member.c         | 2 +-
 lib/gssapi/krb5/address_to_krb5addr.c        | 2 +-
 lib/gssapi/krb5/arcfour.c                    | 2 +-
 lib/gssapi/krb5/canonicalize_name.c          | 2 +-
 lib/gssapi/krb5/ccache_name.c                | 2 +-
 lib/gssapi/krb5/cfx.c                        | 2 +-
 lib/gssapi/krb5/compare_name.c               | 2 +-
 lib/gssapi/krb5/compat.c                     | 2 +-
 lib/gssapi/krb5/context_time.c               | 2 +-
 lib/gssapi/krb5/copy_ccache.c                | 2 +-
 lib/gssapi/krb5/create_emtpy_oid_set.c       | 2 +-
 lib/gssapi/krb5/decapsulate.c                | 2 +-
 lib/gssapi/krb5/delete_sec_context.c         | 2 +-
 lib/gssapi/krb5/display_name.c               | 2 +-
 lib/gssapi/krb5/display_status.c             | 2 +-
 lib/gssapi/krb5/duplicate_name.c             | 2 +-
 lib/gssapi/krb5/encapsulate.c                | 2 +-
 lib/gssapi/krb5/export_name.c                | 2 +-
 lib/gssapi/krb5/export_sec_context.c         | 2 +-
 lib/gssapi/krb5/external.c                   | 2 +-
 lib/gssapi/krb5/get_mic.c                    | 2 +-
 lib/gssapi/krb5/gsskrb5_locl.h               | 6 +++---
 lib/gssapi/krb5/import_name.c                | 2 +-
 lib/gssapi/krb5/import_sec_context.c         | 2 +-
 lib/gssapi/krb5/indicate_mechs.c             | 2 +-
 lib/gssapi/krb5/init.c                       | 2 +-
 lib/gssapi/krb5/init_sec_context.c           | 2 +-
 lib/gssapi/krb5/inquire_context.c            | 2 +-
 lib/gssapi/krb5/inquire_cred.c               | 2 +-
 lib/gssapi/krb5/inquire_cred_by_mech.c       | 2 +-
 lib/gssapi/krb5/inquire_cred_by_oid.c        | 2 +-
 lib/gssapi/krb5/inquire_mechs_for_name.c     | 2 +-
 lib/gssapi/krb5/inquire_names_for_mech.c     | 2 +-
 lib/gssapi/krb5/inquire_sec_context_by_oid.c | 2 +-
 lib/gssapi/krb5/process_context_token.c      | 2 +-
 lib/gssapi/krb5/release_buffer.c             | 2 +-
 lib/gssapi/krb5/release_cred.c               | 2 +-
 lib/gssapi/krb5/release_name.c               | 2 +-
 lib/gssapi/krb5/release_oid_set.c            | 2 +-
 lib/gssapi/krb5/sequence.c                   | 2 +-
 lib/gssapi/krb5/set_cred_option.c            | 2 +-
 lib/gssapi/krb5/set_sec_context_option.c     | 2 +-
 lib/gssapi/krb5/test_acquire_cred.c          | 2 +-
 lib/gssapi/krb5/test_cfx.c                   | 2 +-
 lib/gssapi/krb5/test_cred.c                  | 2 +-
 lib/gssapi/krb5/test_kcred.c                 | 2 +-
 lib/gssapi/krb5/test_oid.c                   | 2 +-
 lib/gssapi/krb5/test_oid_set_member.c        | 2 +-
 lib/gssapi/krb5/test_sequence.c              | 2 +-
 lib/gssapi/krb5/ticket_flags.c               | 2 +-
 lib/gssapi/krb5/unwrap.c                     | 2 +-
 lib/gssapi/krb5/v1.c                         | 2 +-
 lib/gssapi/krb5/verify_mic.c                 | 2 +-
 lib/gssapi/krb5/wrap.c                       | 2 +-
 58 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/lib/gssapi/krb5/8003.c b/lib/gssapi/krb5/8003.c
index 2932486d4..a9b93d32a 100644
--- a/lib/gssapi/krb5/8003.c
+++ b/lib/gssapi/krb5/8003.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c
index 528e03d77..b3cea5be1 100644
--- a/lib/gssapi/krb5/accept_sec_context.c
+++ b/lib/gssapi/krb5/accept_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/acquire_cred.c b/lib/gssapi/krb5/acquire_cred.c
index 2459e778b..c2ce4fbfd 100644
--- a/lib/gssapi/krb5/acquire_cred.c
+++ b/lib/gssapi/krb5/acquire_cred.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/add_cred.c b/lib/gssapi/krb5/add_cred.c
index 8af1e31aa..05b75dac8 100644
--- a/lib/gssapi/krb5/add_cred.c
+++ b/lib/gssapi/krb5/add_cred.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/add_oid_set_member.c b/lib/gssapi/krb5/add_oid_set_member.c
index 5a84dd079..59711bbbc 100644
--- a/lib/gssapi/krb5/add_oid_set_member.c
+++ b/lib/gssapi/krb5/add_oid_set_member.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/address_to_krb5addr.c b/lib/gssapi/krb5/address_to_krb5addr.c
index aaade2f5c..9aec53faa 100644
--- a/lib/gssapi/krb5/address_to_krb5addr.c
+++ b/lib/gssapi/krb5/address_to_krb5addr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 #include <roken.h>
 
diff --git a/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c
index cb53e0c14..fba3b8889 100644
--- a/lib/gssapi/krb5/arcfour.c
+++ b/lib/gssapi/krb5/arcfour.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/canonicalize_name.c b/lib/gssapi/krb5/canonicalize_name.c
index 666758555..a2334580e 100644
--- a/lib/gssapi/krb5/canonicalize_name.c
+++ b/lib/gssapi/krb5/canonicalize_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/ccache_name.c b/lib/gssapi/krb5/ccache_name.c
index e58f680a2..d5f0b083d 100644
--- a/lib/gssapi/krb5/ccache_name.c
+++ b/lib/gssapi/krb5/ccache_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/cfx.c b/lib/gssapi/krb5/cfx.c
index 178570715..75e783783 100644
--- a/lib/gssapi/krb5/cfx.c
+++ b/lib/gssapi/krb5/cfx.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/compare_name.c b/lib/gssapi/krb5/compare_name.c
index 13f87abe5..fb478c1e7 100644
--- a/lib/gssapi/krb5/compare_name.c
+++ b/lib/gssapi/krb5/compare_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/compat.c b/lib/gssapi/krb5/compat.c
index f39a4a9d3..ac1a291bb 100644
--- a/lib/gssapi/krb5/compat.c
+++ b/lib/gssapi/krb5/compat.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/context_time.c b/lib/gssapi/krb5/context_time.c
index 325d24fca..642288fed 100644
--- a/lib/gssapi/krb5/context_time.c
+++ b/lib/gssapi/krb5/context_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/copy_ccache.c b/lib/gssapi/krb5/copy_ccache.c
index 8304fd380..29287edc9 100644
--- a/lib/gssapi/krb5/copy_ccache.c
+++ b/lib/gssapi/krb5/copy_ccache.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/create_emtpy_oid_set.c b/lib/gssapi/krb5/create_emtpy_oid_set.c
index a97ad637a..71ed584a0 100644
--- a/lib/gssapi/krb5/create_emtpy_oid_set.c
+++ b/lib/gssapi/krb5/create_emtpy_oid_set.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/decapsulate.c b/lib/gssapi/krb5/decapsulate.c
index c98cf1043..419e61a43 100644
--- a/lib/gssapi/krb5/decapsulate.c
+++ b/lib/gssapi/krb5/decapsulate.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/delete_sec_context.c b/lib/gssapi/krb5/delete_sec_context.c
index 4e2765b03..d1364d940 100644
--- a/lib/gssapi/krb5/delete_sec_context.c
+++ b/lib/gssapi/krb5/delete_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/display_name.c b/lib/gssapi/krb5/display_name.c
index 7fb248673..747957a54 100644
--- a/lib/gssapi/krb5/display_name.c
+++ b/lib/gssapi/krb5/display_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/display_status.c b/lib/gssapi/krb5/display_status.c
index 97eee6d49..79f6849e3 100644
--- a/lib/gssapi/krb5/display_status.c
+++ b/lib/gssapi/krb5/display_status.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/duplicate_name.c b/lib/gssapi/krb5/duplicate_name.c
index bedf17262..578e9883e 100644
--- a/lib/gssapi/krb5/duplicate_name.c
+++ b/lib/gssapi/krb5/duplicate_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/encapsulate.c b/lib/gssapi/krb5/encapsulate.c
index 54f1ee29f..c29df178f 100644
--- a/lib/gssapi/krb5/encapsulate.c
+++ b/lib/gssapi/krb5/encapsulate.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/export_name.c b/lib/gssapi/krb5/export_name.c
index 3469edc95..8edef2745 100644
--- a/lib/gssapi/krb5/export_name.c
+++ b/lib/gssapi/krb5/export_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/export_sec_context.c b/lib/gssapi/krb5/export_sec_context.c
index 781b811e7..bc19fbba6 100644
--- a/lib/gssapi/krb5/export_sec_context.c
+++ b/lib/gssapi/krb5/export_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/external.c b/lib/gssapi/krb5/external.c
index 1fa9b5a08..0f238cf23 100644
--- a/lib/gssapi/krb5/external.c
+++ b/lib/gssapi/krb5/external.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 #include <gssapi_mech.h>
 
 RCSID("$Id$");
diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c
index 4a6d4d4ad..0c74778f8 100644
--- a/lib/gssapi/krb5/get_mic.c
+++ b/lib/gssapi/krb5/get_mic.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/gsskrb5_locl.h b/lib/gssapi/krb5/gsskrb5_locl.h
index 8e1fcbab2..0f184491f 100644
--- a/lib/gssapi/krb5/gsskrb5_locl.h
+++ b/lib/gssapi/krb5/gsskrb5_locl.h
@@ -33,8 +33,8 @@
 
 /* $Id$ */
 
-#ifndef GSSAPI_LOCL_H
-#define GSSAPI_LOCL_H
+#ifndef GSSKRB5_LOCL_H
+#define GSSKRB5_LOCL_H
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -112,7 +112,7 @@ struct gssapi_thr_context {
  * Prototypes
  */
 
-#include <gsskrb5-private.h>
+#include <krb5/gsskrb5-private.h>
 
 #define GSSAPI_KRB5_INIT() do {					\
     krb5_error_code kret_gss_init;				\
diff --git a/lib/gssapi/krb5/import_name.c b/lib/gssapi/krb5/import_name.c
index 65412f42c..e1a41ed54 100644
--- a/lib/gssapi/krb5/import_name.c
+++ b/lib/gssapi/krb5/import_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/import_sec_context.c b/lib/gssapi/krb5/import_sec_context.c
index da4c03f00..1483e21df 100644
--- a/lib/gssapi/krb5/import_sec_context.c
+++ b/lib/gssapi/krb5/import_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/indicate_mechs.c b/lib/gssapi/krb5/indicate_mechs.c
index 299f53c5c..688b0652e 100644
--- a/lib/gssapi/krb5/indicate_mechs.c
+++ b/lib/gssapi/krb5/indicate_mechs.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/init.c b/lib/gssapi/krb5/init.c
index d6114e07e..cb041cfdd 100644
--- a/lib/gssapi/krb5/init.c
+++ b/lib/gssapi/krb5/init.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index 3e4df6ded..9c468727e 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/inquire_context.c b/lib/gssapi/krb5/inquire_context.c
index a0f94a6cc..440d7c388 100644
--- a/lib/gssapi/krb5/inquire_context.c
+++ b/lib/gssapi/krb5/inquire_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/inquire_cred.c b/lib/gssapi/krb5/inquire_cred.c
index 386cb115e..eff7e7480 100644
--- a/lib/gssapi/krb5/inquire_cred.c
+++ b/lib/gssapi/krb5/inquire_cred.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/inquire_cred_by_mech.c b/lib/gssapi/krb5/inquire_cred_by_mech.c
index a91f8d741..5604ae34a 100644
--- a/lib/gssapi/krb5/inquire_cred_by_mech.c
+++ b/lib/gssapi/krb5/inquire_cred_by_mech.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/inquire_cred_by_oid.c b/lib/gssapi/krb5/inquire_cred_by_oid.c
index e0a11c6d7..5fcb5e0eb 100644
--- a/lib/gssapi/krb5/inquire_cred_by_oid.c
+++ b/lib/gssapi/krb5/inquire_cred_by_oid.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/inquire_mechs_for_name.c b/lib/gssapi/krb5/inquire_mechs_for_name.c
index 9ffce6846..d151397db 100644
--- a/lib/gssapi/krb5/inquire_mechs_for_name.c
+++ b/lib/gssapi/krb5/inquire_mechs_for_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/inquire_names_for_mech.c b/lib/gssapi/krb5/inquire_names_for_mech.c
index 40c4d6b4a..ce79e30cb 100644
--- a/lib/gssapi/krb5/inquire_names_for_mech.c
+++ b/lib/gssapi/krb5/inquire_names_for_mech.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/inquire_sec_context_by_oid.c b/lib/gssapi/krb5/inquire_sec_context_by_oid.c
index a16f45b08..f75796df1 100644
--- a/lib/gssapi/krb5/inquire_sec_context_by_oid.c
+++ b/lib/gssapi/krb5/inquire_sec_context_by_oid.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/process_context_token.c b/lib/gssapi/krb5/process_context_token.c
index e5632665f..841f4018e 100644
--- a/lib/gssapi/krb5/process_context_token.c
+++ b/lib/gssapi/krb5/process_context_token.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/release_buffer.c b/lib/gssapi/krb5/release_buffer.c
index 3d074ea9b..e2f1f4ec1 100644
--- a/lib/gssapi/krb5/release_buffer.c
+++ b/lib/gssapi/krb5/release_buffer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/release_cred.c b/lib/gssapi/krb5/release_cred.c
index eede19ea0..c7cde46a1 100644
--- a/lib/gssapi/krb5/release_cred.c
+++ b/lib/gssapi/krb5/release_cred.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/release_name.c b/lib/gssapi/krb5/release_name.c
index 40a6a917f..e453d288c 100644
--- a/lib/gssapi/krb5/release_name.c
+++ b/lib/gssapi/krb5/release_name.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/release_oid_set.c b/lib/gssapi/krb5/release_oid_set.c
index 17a919a57..d8fc3cb79 100644
--- a/lib/gssapi/krb5/release_oid_set.c
+++ b/lib/gssapi/krb5/release_oid_set.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/sequence.c b/lib/gssapi/krb5/sequence.c
index 47313eeb3..2f5393404 100644
--- a/lib/gssapi/krb5/sequence.c
+++ b/lib/gssapi/krb5/sequence.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/set_cred_option.c b/lib/gssapi/krb5/set_cred_option.c
index 08c40d6a2..23eec42b8 100644
--- a/lib/gssapi/krb5/set_cred_option.c
+++ b/lib/gssapi/krb5/set_cred_option.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/set_sec_context_option.c b/lib/gssapi/krb5/set_sec_context_option.c
index 8555cef55..adab06ed7 100644
--- a/lib/gssapi/krb5/set_sec_context_option.c
+++ b/lib/gssapi/krb5/set_sec_context_option.c
@@ -34,7 +34,7 @@
  *  glue routine for _gsskrb5_inquire_sec_context_by_oid
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/test_acquire_cred.c b/lib/gssapi/krb5/test_acquire_cred.c
index 47dc5b713..852557aec 100644
--- a/lib/gssapi/krb5/test_acquire_cred.c
+++ b/lib/gssapi/krb5/test_acquire_cred.c
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 #include <err.h>
 
 RCSID("$Id$");
diff --git a/lib/gssapi/krb5/test_cfx.c b/lib/gssapi/krb5/test_cfx.c
index dc858ccf1..61227e534 100644
--- a/lib/gssapi/krb5/test_cfx.c
+++ b/lib/gssapi/krb5/test_cfx.c
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/test_cred.c b/lib/gssapi/krb5/test_cred.c
index fab2cd283..9ed570f84 100644
--- a/lib/gssapi/krb5/test_cred.c
+++ b/lib/gssapi/krb5/test_cred.c
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 #include <err.h>
 #include <getarg.h>
 
diff --git a/lib/gssapi/krb5/test_kcred.c b/lib/gssapi/krb5/test_kcred.c
index 9e7cd5d25..8b40d0940 100644
--- a/lib/gssapi/krb5/test_kcred.c
+++ b/lib/gssapi/krb5/test_kcred.c
@@ -31,7 +31,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 #include <err.h>
 #include <getarg.h>
 
diff --git a/lib/gssapi/krb5/test_oid.c b/lib/gssapi/krb5/test_oid.c
index e4a42feda..3f63cce5f 100644
--- a/lib/gssapi/krb5/test_oid.c
+++ b/lib/gssapi/krb5/test_oid.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/test_oid_set_member.c b/lib/gssapi/krb5/test_oid_set_member.c
index e626397e8..d9992a039 100644
--- a/lib/gssapi/krb5/test_oid_set_member.c
+++ b/lib/gssapi/krb5/test_oid_set_member.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/test_sequence.c b/lib/gssapi/krb5/test_sequence.c
index 313d64ee6..ba83cb926 100644
--- a/lib/gssapi/krb5/test_sequence.c
+++ b/lib/gssapi/krb5/test_sequence.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/ticket_flags.c b/lib/gssapi/krb5/ticket_flags.c
index c48873c46..fc125ed9f 100644
--- a/lib/gssapi/krb5/ticket_flags.c
+++ b/lib/gssapi/krb5/ticket_flags.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c
index 716dbd183..752f75479 100644
--- a/lib/gssapi/krb5/unwrap.c
+++ b/lib/gssapi/krb5/unwrap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/v1.c b/lib/gssapi/krb5/v1.c
index b861ba3a4..30e0e7b3d 100644
--- a/lib/gssapi/krb5/v1.c
+++ b/lib/gssapi/krb5/v1.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c
index b8738c0c1..c829a6146 100644
--- a/lib/gssapi/krb5/verify_mic.c
+++ b/lib/gssapi/krb5/verify_mic.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c
index b3ab8411f..8d755c944 100644
--- a/lib/gssapi/krb5/wrap.c
+++ b/lib/gssapi/krb5/wrap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "gsskrb5_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
 RCSID("$Id$");