diff --git a/lib/krb5/config_file.h b/lib/krb5/config_file.h
index 88e7425a5..0955e5a09 100644
--- a/lib/krb5/config_file.h
+++ b/lib/krb5/config_file.h
@@ -1,57 +1,26 @@
 /* $Id$ */
 
-#ifndef __CONF_H__
-#define __CONF_H__
+#ifndef __CONFIG_FILE_H__
+#define __CONFIG_FILE_H__
 
-enum { 
-  krb5_config_value_string, 
-  krb5_config_value_list 
+struct krb5_config_binding {
+    enum { STRING, LIST } type;
+    char *name;
+    struct krb5_config_binding *next;
+    union {
+	char *string;
+	struct krb5_config_binding *list;
+    } u;
 };
 
-struct krb5_config_relation;
+typedef struct krb5_config_binding krb5_config_binding;
 
-typedef struct krb5_config_value{
-  int type;
-  union {
-    char *string;
-    struct krb5_config_relation *relations;
-  }data;
-}krb5_config_value;
+struct krb5_config_section {
+    char *name;
+    krb5_config_binding *list;
+    struct krb5_config_section *next;
+};
 
-typedef struct krb5_config_relation{
-  char *tag;
-  struct krb5_config_value value;
-  struct krb5_config_relation *next;
-}krb5_config_relation;
+typedef struct krb5_config_section krb5_config_section;
 
-typedef struct krb5_config_section{
-  char *name;
-  struct krb5_config_relation *relations;
-  struct krb5_config_section *next;
-}krb5_config_section;
-
-typedef struct k5_cfile{
-  char *filename;
-  struct krb5_config_section *sections;
-}k5_cfile;
-
-
-
-/*
-static char *gettoken(FILE *F);
-static void
-free_config_file(k5_cfile *cf);
-static krb5_error_code
-new_config_file(k5_cfile **cf, const char *filename);
-static void
-free_config_section(krb5_config_section *sec);
-static krb5_error_code
-new_config_section(krb5_config_section **sec, const char *name);
-static void
-free_config_relation(krb5_config_relation *rel);
-static void
-free_config_value(krb5_config_value val);
-static krb5_error_code
-parse_config_file(k5_cfile **cf, const char *filename);
-*/
-#endif /* __CONF_H__ */
+#endif /* __CONFIG_FILE_H__ */