diff -urN -Xfreeciv/diff_ignore freeciv/common/Makefile.am freeciv-attrib/common/Makefile.am
--- freeciv/common/Makefile.am	Thu Sep 19 16:39:37 2002
+++ freeciv-attrib/common/Makefile.am	Wed Oct  9 16:18:50 2002
@@ -9,7 +9,6 @@
 libcivcommon_a_SOURCES = \
 		astring.c       \
 		astring.h       \
-		attribute.h	\
 		capability.c	\
 		capability.h	\
 		capstr.c	\
diff -urN -Xfreeciv/diff_ignore freeciv/common/attribute.h freeciv-attrib/common/attribute.h
--- freeciv/common/attribute.h	Mon Apr 26 09:10:32 1999
+++ freeciv-attrib/common/attribute.h	Thu Jan  1 01:00:00 1970
@@ -1,29 +0,0 @@
-/********************************************************************** 
- Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-***********************************************************************/
-#ifndef FC__ATTRIBUTE_H
-#define FC__ATTRIBUTE_H
-
-/* Want to use GCC's __attribute__ keyword to check variadic
- * parameters to printf-like functions, without upsetting other
- * compilers: put any required defines magic here.
- * If other compilers have something equivalent, could also
- * work that out here.   Should this use configure stuff somehow?
- * --dwp
- */
-#if defined(__GNUC__)
-#define fc__attribute(x)  __attribute__(x)
-#else
-#define fc__attribute(x)
-#endif
-
-#endif  /* FC__ATTRIBUTE_H */
diff -urN -Xfreeciv/diff_ignore freeciv/common/ioz.h freeciv-attrib/common/ioz.h
--- freeciv/common/ioz.h	Thu Feb  7 11:24:20 2002
+++ freeciv-attrib/common/ioz.h	Wed Oct  9 16:13:30 2002
@@ -19,7 +19,7 @@
   (Currently only "required" functionality is supported.)
 ***********************************************************************/
 
-#include "attribute.h"
+#include "shared.h"
 
 struct fz_FILE_s;		  /* opaque */
 typedef struct fz_FILE_s fz_FILE;
diff -urN -Xfreeciv/diff_ignore freeciv/common/log.h freeciv-attrib/common/log.h
--- freeciv/common/log.h	Wed Oct  2 11:45:51 2002
+++ freeciv-attrib/common/log.h	Wed Oct  9 16:13:35 2002
@@ -15,7 +15,6 @@
 
 #include <stdarg.h>
 
-#include "attribute.h"
 #include "shared.h"		/* bool type */
 
 #define LOG_FATAL   0
diff -urN -Xfreeciv/diff_ignore freeciv/common/registry.h freeciv-attrib/common/registry.h
--- freeciv/common/registry.h	Fri Apr 12 15:50:56 2002
+++ freeciv-attrib/common/registry.h	Wed Oct  9 16:13:42 2002
@@ -13,7 +13,6 @@
 #ifndef FC__REGISTRY_H
 #define FC__REGISTRY_H
 
-#include "attribute.h"
 #include "shared.h"		/* bool type */
 
 struct sbuffer;
diff -urN -Xfreeciv/diff_ignore freeciv/common/shared.h freeciv-attrib/common/shared.h
--- freeciv/common/shared.h	Wed Oct  2 11:45:51 2002
+++ freeciv-attrib/common/shared.h	Wed Oct  9 16:13:11 2002
@@ -15,7 +15,18 @@
 
 #include <stdlib.h>		/* size_t */
 
-#include "attribute.h"
+/* Want to use GCC's __attribute__ keyword to check variadic
+ * parameters to printf-like functions, without upsetting other
+ * compilers: put any required defines magic here.
+ * If other compilers have something equivalent, could also
+ * work that out here.   Should this use configure stuff somehow?
+ * --dwp
+ */
+#if defined(__GNUC__)
+#define fc__attribute(x)  __attribute__(x)
+#else
+#define fc__attribute(x)
+#endif
 
 /* Note: the capability string is now in capstr.c --dwp */
 /* Version stuff is now in version.h --dwp */
diff -urN -Xfreeciv/diff_ignore freeciv/common/support.h freeciv-attrib/common/support.h
--- freeciv/common/support.h	Wed Aug  7 13:21:48 2002
+++ freeciv-attrib/common/support.h	Wed Oct  9 16:13:48 2002
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #endif
 
-#include "attribute.h"
 #include "shared.h"		/* bool type */
 
 int mystrcasecmp(const char *str0, const char *str1);
diff -urN -Xfreeciv/diff_ignore freeciv/server/console.h freeciv-attrib/server/console.h
--- freeciv/server/console.h	Thu Aug 15 11:56:01 2002
+++ freeciv-attrib/server/console.h	Wed Oct  9 16:14:10 2002
@@ -13,7 +13,6 @@
 #ifndef FC__CONSOLE_H
 #define FC__CONSOLE_H
 
-#include "attribute.h"
 #include "shared.h"		/* bool type */
 
 #define MAX_LEN_CONSOLE_LINE 512	/* closing \0 included */
diff -urN -Xfreeciv/diff_ignore freeciv/server/gamelog.h freeciv-attrib/server/gamelog.h
--- freeciv/server/gamelog.h	Wed Oct  2 11:46:06 2002
+++ freeciv-attrib/server/gamelog.h	Wed Oct  9 16:14:29 2002
@@ -14,7 +14,7 @@
 #ifndef FC__GAMELOG_H
 #define FC__GAMELOG_H
 
-#include "attribute.h"
+#include "shared.h"
 
 #define GAMELOG_FATAL  0
 #define GAMELOG_NORMAL 1
diff -urN -Xfreeciv/diff_ignore freeciv/server/plrhand.h freeciv-attrib/server/plrhand.h
--- freeciv/server/plrhand.h	Wed Oct  2 11:46:06 2002
+++ freeciv-attrib/server/plrhand.h	Wed Oct  9 16:14:42 2002
@@ -13,7 +13,7 @@
 #ifndef FC__PLRHAND_H
 #define FC__PLRHAND_H
 
-#include "attribute.h"
+#include "shared.h"
 #include "packets.h"
 
 struct player;
diff -urN -Xfreeciv/diff_ignore freeciv/server/stdinhand.c freeciv-attrib/server/stdinhand.c
--- freeciv/server/stdinhand.c	Wed Oct  9 15:45:29 2002
+++ freeciv-attrib/server/stdinhand.c	Wed Oct  9 16:15:02 2002
@@ -29,7 +29,6 @@
 #endif
 
 #include "astring.h"
-#include "attribute.h"
 #include "events.h"
 #include "fcintl.h"
 #include "game.h"