diff --git a/lib/gssapi/spnego/accept_sec_context.c b/lib/gssapi/spnego/accept_sec_context.c
index 7fd36dfde..77b1bb2a9 100644
--- a/lib/gssapi/spnego/accept_sec_context.c
+++ b/lib/gssapi/spnego/accept_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "spnego_locl.h"
+#include "spnego/spnego_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/spnego/compat.c b/lib/gssapi/spnego/compat.c
index 85030c1ef..5e6b2f738 100644
--- a/lib/gssapi/spnego/compat.c
+++ b/lib/gssapi/spnego/compat.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "spnego_locl.h"
+#include "spnego/spnego_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/spnego/context_stubs.c b/lib/gssapi/spnego/context_stubs.c
index 99a277db8..eb2ec2051 100644
--- a/lib/gssapi/spnego/context_stubs.c
+++ b/lib/gssapi/spnego/context_stubs.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "spnego_locl.h"
+#include "spnego/spnego_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/spnego/cred_stubs.c b/lib/gssapi/spnego/cred_stubs.c
index 80c8bff14..356c1f33d 100644
--- a/lib/gssapi/spnego/cred_stubs.c
+++ b/lib/gssapi/spnego/cred_stubs.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "spnego_locl.h"
+#include "spnego/spnego_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/spnego/external.c b/lib/gssapi/spnego/external.c
index ae401acb5..1d8fc732d 100644
--- a/lib/gssapi/spnego/external.c
+++ b/lib/gssapi/spnego/external.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "spnego_locl.h"
+#include "spnego/spnego_locl.h"
 #include <gssapi_mech.h>
 
 RCSID("$Id$");
diff --git a/lib/gssapi/spnego/gssapi_spnego.h b/lib/gssapi/spnego/gssapi_spnego.h
deleted file mode 100644
index 4720de21e..000000000
--- a/lib/gssapi/spnego/gssapi_spnego.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- *
- * 3. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
- */
-
-/* $Id$ */
-
-#ifndef GSSAPI_SPNEGO_H_
-#define GSSAPI_SPNEGO_H_
-
-#include <gssapi.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * RFC2478, SPNEGO:
- *  The security mechanism of the initial
- *  negotiation token is identified by the Object Identifier
- *  iso.org.dod.internet.security.mechanism.snego (1.3.6.1.5.5.2).
- */
-extern gss_OID GSS_SPNEGO_MECHANISM;
-#define gss_mech_spnego GSS_SPNEGO_MECHANISM
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GSSAPI_SPNEGO_H_ */
diff --git a/lib/gssapi/spnego/init_sec_context.c b/lib/gssapi/spnego/init_sec_context.c
index f7952b64d..0123d04f2 100644
--- a/lib/gssapi/spnego/init_sec_context.c
+++ b/lib/gssapi/spnego/init_sec_context.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "spnego_locl.h"
+#include "spnego/spnego_locl.h"
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/spnego/spnego_locl.h b/lib/gssapi/spnego/spnego_locl.h
index 2d3d7b9cc..9e0bd421e 100644
--- a/lib/gssapi/spnego/spnego_locl.h
+++ b/lib/gssapi/spnego/spnego_locl.h
@@ -50,7 +50,7 @@
 #include <pthread.h>
 #endif
 
-#include <gssapi_spnego.h>
+#include <gssapi/gssapi_spnego.h>
 #include <gssapi.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -58,12 +58,13 @@
 #include <errno.h>
 #include <ctype.h>
 #include <heim_threads.h>
-#include "spnego_asn1.h"
-#include <der.h>
 #include <asn1_err.h>
 
 #include <gssapi_mech.h>
 
+#include "spnego_asn1.h"
+#include <der.h>
+
 #define ALLOC(X, N) (X) = calloc((N), sizeof(*(X)))
 
 typedef struct {
@@ -86,6 +87,6 @@ typedef struct {
 	HEIMDAL_MUTEX		ctx_id_mutex;
 } *gssspnego_ctx;
 
-#include <spnego-private.h>
+#include <spnego/spnego-private.h>
 
 #endif /* SPNEGO_LOCL_H */