diff --git a/lib/com_err/com_err.h b/lib/com_err/com_err.h
index 88a557491..d6b2f7139 100644
--- a/lib/com_err/com_err.h
+++ b/lib/com_err/com_err.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -55,7 +55,7 @@
 #endif
 #endif
 
-#include <error.h>
+#include <com_right.h>
 
 typedef void (*errf) __P((const char *, long, const char *, va_list));
 
diff --git a/lib/com_err/com_right.h b/lib/com_err/com_right.h
index 1fe7c0f9c..8412f72cc 100644
--- a/lib/com_err/com_right.h
+++ b/lib/com_err/com_right.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -38,8 +38,8 @@
 
 /* $Id$ */
 
-#ifndef __ERROR_H__
-#define __ERROR_H__
+#ifndef __COM_RIGHT_H__
+#define __COM_RIGHT_H__
 
 struct error_table {
     char const * const * msgs;
@@ -52,4 +52,4 @@ const char *com_right(struct error_table *list, long code);
 void initialize_error_table_r(struct error_table**, const char**, int, long);
 void free_error_table(struct error_table*);
 
-#endif /* __ERROR_H__ */
+#endif /* __COM_RIGHT_H__ */
diff --git a/lib/com_err/error.c b/lib/com_err/error.c
index 992fdcd5c..337a3b87b 100644
--- a/lib/com_err/error.c
+++ b/lib/com_err/error.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -43,7 +43,7 @@ RCSID("$Id$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <error.h>
+#include <com_right.h>
 
 const char *
 com_right(struct error_table *list, long code)
diff --git a/lib/com_err/error.h b/lib/com_err/error.h
deleted file mode 100644
index 1fe7c0f9c..000000000
--- a/lib/com_err/error.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1997 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. All advertising materials mentioning features or use of this software 
- *    must display the following acknowledgement: 
- *      This product includes software developed by Kungliga Tekniska 
- *      Högskolan and its contributors. 
- *
- * 4. 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 __ERROR_H__
-#define __ERROR_H__
-
-struct error_table {
-    char const * const * msgs;
-    long base;
-    int n_msgs;
-    struct error_table *next;
-};
-
-const char *com_right(struct error_table *list, long code);
-void initialize_error_table_r(struct error_table**, const char**, int, long);
-void free_error_table(struct error_table*);
-
-#endif /* __ERROR_H__ */