diff -ruN -X freeciv/diff_ignore freeciv/common/city.h freeciv.mod/common/city.h
--- freeciv/common/city.h	Wed Dec 20 21:04:41 2000
+++ freeciv.mod/common/city.h	Mon Jan 15 18:37:05 2001
@@ -192,7 +192,7 @@
   enum city_tile_type city_map[CITY_MAP_SIZE][CITY_MAP_SIZE];
 
   struct unit_list units_supported;
-  int steal;		      /* diplomats steal once; for spies, gets harder */
+
   /* turn states */
   int did_buy, did_sell, is_updated;
   int turn_last_built;	      /* The last year in which something was built */
@@ -200,18 +200,24 @@
   int changed_from_id;	      /* If changed this turn, what changed from (id) */
   int changed_from_is_unit;   /* If changed this turn, what changed from (unit?) */
   int before_change_shields;  /* If changed this turn, shields before penalty */
-  int anarchy;		      /* anarchy rounds count */ 
-  int rapture;                /* rapture rounds count */ 
   int was_happy;
   int airlift;
-  int original;			/* original owner */
+
   int city_options;		/* bitfield; positions as enum city_options */
 
-  /* info for dipl/spy investigation -- used only in client */
-  struct unit_list info_units_supported;
-  struct unit_list info_units_present;
+  struct {
+    /* info for dipl/spy investigation -- used only in client */
+    struct unit_list info_units_supported;
+    struct unit_list info_units_present;
+  } client;
 
-  struct ai_city ai;
+  struct {
+    int steal;			/* diplomats steal once; for spies, gets harder */
+    struct ai_city ai;
+    int anarchy;		/* anarchy rounds count */
+    int rapture;		/* rapture rounds count */
+    int original;		/* original owner */
+  } server;
 };
 
 /* city drawing styles */
diff -ruN -X freeciv/diff_ignore freeciv/common/unit.h freeciv.mod/common/unit.h
--- freeciv/common/unit.h	Fri Dec 15 19:30:31 2000
+++ freeciv.mod/common/unit.h	Mon Jan 15 18:08:38 2001
@@ -83,23 +83,25 @@
   int upkeep;
   int upkeep_food;
   int upkeep_gold;
-  int foul;
   int fuel;
   int bribe_cost;
-  struct unit_ai ai;
   enum unit_activity activity;
   int goto_dest_x, goto_dest_y;
-  int activity_count;
   int activity_target;
   enum unit_focus_status focus_status;
-  int ord_map, ord_city;
-  /* ord_map and ord_city are the order index of this unit in tile.units
-     and city.units_supported; they are only used for save/reload */
-  int moved;
   int paradropped;
   int connecting;
-  int transported_by;
   struct goto_route *pgr;
+  struct {
+    int foul;
+    struct unit_ai ai;
+    int ord_map, ord_city;
+    /* ord_map and ord_city are the order index of this unit in tile.units
+       and city.units_supported; they are only used for save/reload */
+    int moved;
+    int transported_by;
+    int activity_count;
+  } server;
 };