13 files changed, 14 insertions, 14 deletions
diff --git a/crawl-ref/source/arena.h b/crawl-ref/source/arena.h
index 619767d841..d79d2f834d 100644
--- a/crawl-ref/source/arena.h
+++ b/crawl-ref/source/arena.h
@@ -10,7 +10,7 @@
 
 class level_id;
 class monsters;
-class mgen_data;
+struct mgen_data;
 
 struct coord_def;
 
diff --git a/crawl-ref/source/artefact.h b/crawl-ref/source/artefact.h
index 0bc887c647..aec4951dd7 100644
--- a/crawl-ref/source/artefact.h
+++ b/crawl-ref/source/artefact.h
@@ -10,7 +10,7 @@
 
 #include "externs.h"
 
-class bolt;
+struct bolt;
 
 // NOTE: NO_UNRANDARTS is automatically set by util/art-data.pl
 #define NO_UNRANDARTS 82
diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h
index 7c60170f41..d1a47e1a0f 100644
--- a/crawl-ref/source/beam.h
+++ b/crawl-ref/source/beam.h
@@ -31,7 +31,7 @@ enum mon_resist_type
     MON_OTHER                   // monster unaffected, but for other reasons
 };
 
-struct dist;
+class dist;
 
 typedef FixedArray<int, 19, 19> explosion_map;
 
diff --git a/crawl-ref/source/item_use.h b/crawl-ref/source/item_use.h
index 8df61d07b6..a76dc3843c 100644
--- a/crawl-ref/source/item_use.h
+++ b/crawl-ref/source/item_use.h
@@ -39,7 +39,7 @@ enum fire_type
 };
 
 struct bolt;
-struct dist;
+class dist;
 
 bool armour_prompt(const std::string & mesg, int *index, operation_types oper);
 
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index 3ef19e0eeb..354109e8a1 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -258,7 +258,7 @@ std::string parse_weighted_str(const std::string &cspec, T &list);
 
 class map_def;
 class rectangle_iterator;
-class keyed_mapspec;
+struct keyed_mapspec;
 class map_lines
 {
 public:
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h
index 9f75955885..9b0eaa47a7 100644
--- a/crawl-ref/source/misc.h
+++ b/crawl-ref/source/misc.h
@@ -10,7 +10,7 @@
 #include "externs.h"
 
 struct bolt;
-struct dist;
+class dist;
 struct activity_interrupt_data;
 
 bool go_berserk(bool intentional);
diff --git a/crawl-ref/source/mon-abil.h b/crawl-ref/source/mon-abil.h
index 47aee1641a..845b114c49 100644
--- a/crawl-ref/source/mon-abil.h
+++ b/crawl-ref/source/mon-abil.h
@@ -8,7 +8,7 @@
 #define MONABIL_H
 
 class monsters;
-class bolt;
+struct bolt;
 
 bool mon_special_ability(monsters *monster, bolt & beem);
 void mon_nearby_ability(monsters *monster);
diff --git a/crawl-ref/source/mon-cast.h b/crawl-ref/source/mon-cast.h
index 22629b4f9a..45e87e73c4 100644
--- a/crawl-ref/source/mon-cast.h
+++ b/crawl-ref/source/mon-cast.h
@@ -10,7 +10,7 @@
 #include "enum.h"
 
 class monsters;
-class bolt;
+struct bolt;
 
 void init_mons_spells();
 bool is_valid_mon_spell(spell_type spell);
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index 64349079de..83ba485321 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -10,7 +10,7 @@
 #include "enum.h"
 #include "itemprop-enum.h"
 
-struct dist;
+class dist;
 
 bool brand_weapon(brand_type which_brand, int power);
 bool brand_ammo(special_missile_type which_brand);
@@ -19,7 +19,7 @@ bool burn_freeze(int pow, beam_type flavour, monsters *monster);
 void corpse_rot();
 
 
-struct dist;
+class dist;
 bool vampiric_drain(int pow, const dist &vmove);
 int detect_creatures(int pow, bool telepathic = false);
 int detect_items(int pow);
diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h
index b41a35ae3a..30252963e5 100644
--- a/crawl-ref/source/spells3.h
+++ b/crawl-ref/source/spells3.h
@@ -10,7 +10,7 @@
 
 #include "itemprop-enum.h"
 
-struct dist;
+class dist;
 struct bolt;
 
 bool allow_control_teleport(bool quiet = false);
diff --git a/crawl-ref/source/spells4.h b/crawl-ref/source/spells4.h
index cd977e3d01..3f6bbbd3ac 100644
--- a/crawl-ref/source/spells4.h
+++ b/crawl-ref/source/spells4.h
@@ -10,7 +10,7 @@
 
 #include "externs.h"
 
-struct dist;
+class dist;
 struct bolt;
 
 bool backlight_monsters(coord_def where, int pow, int garbage);
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h
index eb44f4db07..a1738c17a9 100644
--- a/crawl-ref/source/spl-util.h
+++ b/crawl-ref/source/spl-util.h
@@ -32,7 +32,7 @@ enum spschool_flag_type
 };
 
 struct bolt;
-struct dist;
+class dist;
 
 bool is_valid_spell(spell_type spell);
 void init_spell_descs(void);
diff --git a/crawl-ref/source/view.h b/crawl-ref/source/view.h
index 70029c000d..33a525cba2 100644
--- a/crawl-ref/source/view.h
+++ b/crawl-ref/source/view.h
@@ -25,7 +25,7 @@ bool magic_mapping(int map_radius, int proportion, bool suppress_msg,
                    coord_def origin = coord_def(-1, -1));
 void reautomap_level();
 
-class level_pos;
+struct level_pos;
 void show_map( level_pos &spec_place, bool travel_mode, bool allow_esc = false );
 bool is_feature(int feature, const coord_def& where);