diff --git a/src/data/settings.cpp b/src/data/settings.cpp
index 91e7c583..5fa91868 100644
--- a/src/data/settings.cpp
+++ b/src/data/settings.cpp
@@ -149,8 +149,8 @@ StyleSheetSettings& Settings::stylesheetSettingsFor(const StyleSheet& stylesheet
 	return *ss;
 }
 
-IndexMap<FieldP,ValueP>& Settings::exportOptionsFor(const ExportTemplate& export) {
-	return export_options.get(export.name(), export.option_fields);
+IndexMap<FieldP,ValueP>& Settings::exportOptionsFor(const ExportTemplate& export_template) {
+	return export_options.get(export_template.name(), export_template.option_fields);
 }
 
 /// Retrieve the directory to use for settings and other data files
diff --git a/src/data/settings.hpp b/src/data/settings.hpp
index c8e52d26..ad111fac 100644
--- a/src/data/settings.hpp
+++ b/src/data/settings.hpp
@@ -142,7 +142,7 @@ class Settings {
   public:
 	
 	/// Get the options for an export template
-	IndexMap<FieldP,ValueP>& exportOptionsFor(const ExportTemplate& export);
+	IndexMap<FieldP,ValueP>& exportOptionsFor(const ExportTemplate& export_template);
 	
 	// --------------------------------------------------- : Special game stuff
 	String apprentice_location;
diff --git a/src/gui/control/native_look_editor.cpp b/src/gui/control/native_look_editor.cpp
index 38b100db..8832dd5b 100644
--- a/src/gui/control/native_look_editor.cpp
+++ b/src/gui/control/native_look_editor.cpp
@@ -213,8 +213,8 @@ ExportOptionsEditor::ExportOptionsEditor(Window* parent, int id, long style)
 	: NativeLookEditor(parent, id, style)
 {}
 
-void ExportOptionsEditor::showExport(const ExportTemplateP& export) {
-	setStyles(set->stylesheet, export->option_style);
-	setData(settings.exportOptionsFor(*export));
+void ExportOptionsEditor::showExport(const ExportTemplateP& export_template) {
+	setStyles(set->stylesheet, export_template->option_style);
+	setData(settings.exportOptionsFor(*export_template));
 }
 
diff --git a/src/gui/control/native_look_editor.hpp b/src/gui/control/native_look_editor.hpp
index 4f002276..e1c68465 100644
--- a/src/gui/control/native_look_editor.hpp
+++ b/src/gui/control/native_look_editor.hpp
@@ -85,7 +85,7 @@ class ExportOptionsEditor : public NativeLookEditor {
 	ExportOptionsEditor(Window* parent, int id, long style = 0);
 	
 	/// Show the options for given export template
-	void showExport(const ExportTemplateP& export);
+	void showExport(const ExportTemplateP& export_template);
 };
 
 // ----------------------------------------------------------------------------- : EOF
diff --git a/src/gui/html_export_window.cpp b/src/gui/html_export_window.cpp
index 2a11e542..6ec60bb3 100644
--- a/src/gui/html_export_window.cpp
+++ b/src/gui/html_export_window.cpp
@@ -62,10 +62,10 @@ void HtmlExportWindow::onOk(wxCommandEvent&) {
 
 void HtmlExportWindow::onTemplateSelect(wxCommandEvent&) {
 	wxBusyCursor wait;
-	ExportTemplateP export = list->getSelection<ExportTemplate>();
+	ExportTemplateP export_template = list->getSelection<ExportTemplate>();
 	handle_pending_errors();
-	options->showExport(export);
-	settings.gameSettingsFor(*set->game).default_export = export->name();
+	options->showExport(export_template);
+	settings.gameSettingsFor(*set->game).default_export = export_template->name();
 	UpdateWindowUI(wxUPDATE_UI_RECURSE);
 }
 
diff --git a/src/util/delayed_index_maps.hpp b/src/util/delayed_index_maps.hpp
index cf41c967..aa694391 100644
--- a/src/util/delayed_index_maps.hpp
+++ b/src/util/delayed_index_maps.hpp
@@ -60,7 +60,7 @@ void GetMember::handle(const DelayedIndexMapsData<Key,Value>& d) {
 	handle(d.read_data);
 }
 template <typename Key, typename Value>
-void GetDefaultMember::handle(const DelayedIndexMapsData<Key,Value>&) {
+void GetDefaultMember::handle(const DelayedIndexMapsData<Key,Value>& d) {
 	handle(d.read_data);
 }
 
diff --git a/src/util/index_map.hpp b/src/util/index_map.hpp
index 7caa814a..fbce1c08 100644
--- a/src/util/index_map.hpp
+++ b/src/util/index_map.hpp
@@ -134,7 +134,7 @@ inline void swap(IndexMap<Key,Value>& a, IndexMap<Key,Value>& b) {
 /* Invariant: read_data is initialized <=> unread_data.empty()
  */
 template <typename Key, typename Value>
-struct DelayedIndexMapsData : public IntrusivePtrBase<DelayedIndexMapsData> {
+struct DelayedIndexMapsData : public IntrusivePtrBase<DelayedIndexMapsData<Key, Value> > {
 	String              unread_data;
 	IndexMap<Key,Value> read_data;
 };