diff --git a/aegisub/libaegisub/common/vfr.cpp b/aegisub/libaegisub/common/vfr.cpp
index d892204e0..30f846f61 100644
--- a/aegisub/libaegisub/common/vfr.cpp
+++ b/aegisub/libaegisub/common/vfr.cpp
@@ -34,7 +34,7 @@
 #include "libaegisub/line_iterator.h"
 
 namespace std {
-	template<> void swap(agi::vfr::Framerate &lft, agi::vfr::Framerate &rgt) throw() {
+	template<> void swap(agi::vfr::Framerate &lft, agi::vfr::Framerate &rgt) {
 		lft.swap(rgt);
 	}
 }
diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h
index 020e4c01d..255ab4b23 100644
--- a/aegisub/src/ass_attachment.h
+++ b/aegisub/src/ass_attachment.h
@@ -95,7 +95,7 @@ public:
 
 	/// @brief DOCME
 	///
-	ASS_EntryType GetType() { return ENTRY_ATTACHMENT; }
+	ASS_EntryType GetType() const { return ENTRY_ATTACHMENT; }
 	AssEntry *Clone() const;
 
 	AssAttachment(wxString name);
diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h
index 35066a30e..f92b5b05a 100644
--- a/aegisub/src/ass_entry.h
+++ b/aegisub/src/ass_entry.h
@@ -91,7 +91,7 @@ namespace Aegisub {
 		/// @brief DOCME
 		/// @return 
 		///
-		const char *GetName() { return "internal_error/invalid_margin_id"; }
+		const char *GetName() const { return "internal_error/invalid_margin_id"; }
 	};
 }
 
diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp
index 3c46cb352..79c3b0d2b 100644
--- a/aegisub/src/audio_controller.cpp
+++ b/aegisub/src/audio_controller.cpp
@@ -60,8 +60,8 @@
 #include "video_context.h"
 
 class AudioMarkerKeyframe : public AudioMarker {
-	int64_t position;
 	Pen *style;
+	int64_t position;
 public:
 	AudioMarkerKeyframe(Pen *style, int64_t position) : style(style), position(position) { }
 	int64_t GetPosition() const { return position; }
@@ -140,8 +140,8 @@ public:
 };
 
 class VideoPositionMarker : public AudioMarker {
-	int64_t position;
 	Pen style;
+	int64_t position;
 
 public:
 	VideoPositionMarker()
diff --git a/aegisub/src/audio_provider_convert.cpp b/aegisub/src/audio_provider_convert.cpp
index eaa28e1ae..a465afdb0 100644
--- a/aegisub/src/audio_provider_convert.cpp
+++ b/aegisub/src/audio_provider_convert.cpp
@@ -93,9 +93,9 @@ public:
 				}
 			}
 
-			if (src_bytes_per_sample > sizeof(Target))
+			if (static_cast<size_t>(src_bytes_per_sample) > sizeof(Target))
 				sample >>= (src_bytes_per_sample - sizeof(Target)) * 8;
-			else if (src_bytes_per_sample < sizeof(Target))
+			else if (static_cast<size_t>(src_bytes_per_sample) < sizeof(Target))
 				sample <<= (sizeof(Target) - src_bytes_per_sample ) * 8;
 
 			dest[i] = (Target)sample;
diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp
index 3c0e202f7..93e61ef7f 100644
--- a/aegisub/src/auto4_base.cpp
+++ b/aegisub/src/auto4_base.cpp
@@ -208,7 +208,7 @@ namespace Automation4 {
 			config_dialog = 0;
 		}
 
-		if (config_dialog = GenerateConfigDialog(parent, c)) {
+		if ((config_dialog = GenerateConfigDialog(parent, c))) {
 			wxString val = c->ass->GetScriptInfo(GetScriptSettingsIdentifier());
 			if (!val.empty())
 				config_dialog->Unserialise(val);
diff --git a/aegisub/src/command/grid.cpp b/aegisub/src/command/grid.cpp
index c3d41f48c..caf721378 100644
--- a/aegisub/src/command/grid.cpp
+++ b/aegisub/src/command/grid.cpp
@@ -183,7 +183,7 @@ struct grid_swap_up : public Command {
 	STR_HELP("Move the selected line up one row")
 	CMD_TYPE(COMMAND_VALIDATE)
 
-	bool Validate(agi::Context *c) {
+	bool Validate(const agi::Context *c) {
 		return c->selectionController->GetActiveLine() != 0;
 	}
 
@@ -203,15 +203,15 @@ struct grid_swap_down : public Command {
 	STR_HELP("Move the selected line down one row")
 	CMD_TYPE(COMMAND_VALIDATE)
 
-	bool Validate(agi::Context *c) {
+	bool Validate(const agi::Context *c) {
 		return c->selectionController->GetActiveLine() != 0;
 	}
 
-		void operator()(agi::Context *c) {
-			if (AssDialogue *line = c->selectionController->GetActiveLine()) {
-				if (move_one(c->ass->Line.begin(), c->ass->Line.end(), line))
-					c->ass->Commit(_("swap lines"), AssFile::COMMIT_ORDER);
-			}
+	void operator()(agi::Context *c) {
+		if (AssDialogue *line = c->selectionController->GetActiveLine()) {
+			if (move_one(c->ass->Line.begin(), c->ass->Line.end(), line))
+				c->ass->Commit(_("swap lines"), AssFile::COMMIT_ORDER);
+		}
 	}
 };
 }
diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp
index 8c6bce1a6..d99514744 100644
--- a/aegisub/src/command/tool.cpp
+++ b/aegisub/src/command/tool.cpp
@@ -149,7 +149,7 @@ struct tool_style_assistant : public Command {
 struct tool_styling_assistant_validator : public Command {
 	CMD_TYPE(COMMAND_VALIDATE)
 
-	bool Validate(agi::Context *c) {
+	bool Validate(const agi::Context *c) {
 		return !!c->stylingAssistant;
 	}
 };
@@ -237,7 +237,7 @@ struct tool_translation_assistant : public Command {
 struct tool_translation_assistant_validator : public Command {
 	CMD_TYPE(COMMAND_VALIDATE)
 
-	bool Validate(agi::Context *c) {
+	bool Validate(const agi::Context *c) {
 		return !!c->translationAssistant;
 	}
 };
diff --git a/aegisub/src/dialog_export.cpp b/aegisub/src/dialog_export.cpp
index f7ee22cf6..3a537f208 100644
--- a/aegisub/src/dialog_export.cpp
+++ b/aegisub/src/dialog_export.cpp
@@ -180,7 +180,7 @@ void DialogExport::OnChange(wxCommandEvent &) {
 
 // Swap the items at idx and idx + 1
 static void swap(wxCheckListBox *list, int idx, int sel_dir) {
-	if (idx < 0 || idx + 1 == list->GetCount()) return;
+	if (idx < 0 || idx + 1 == (int)list->GetCount()) return;
 
 	list->Freeze();
 	wxString tempname = list->GetString(idx);
diff --git a/aegisub/src/factory_manager.h b/aegisub/src/factory_manager.h
index 6ae491717..baee71f2b 100644
--- a/aegisub/src/factory_manager.h
+++ b/aegisub/src/factory_manager.h
@@ -116,7 +116,7 @@ public:
 
 	template<class T>
 	static void Register(std::string name, bool hide = false, std::vector<std::string> subTypes = std::vector<std::string>()) {
-		DoRegister(&Factory0<Base>::template create<T>, name, hide, subTypes);
+		FactoryBase<func>::DoRegister(&Factory0<Base>::template create<T>, name, hide, subTypes);
 	}
 };
 
@@ -140,6 +140,6 @@ public:
 
 	template<class T>
 	static void Register(std::string name, bool hide = false, std::vector<std::string> subTypes = std::vector<std::string>()) {
-		DoRegister(&Factory1<Base, Arg1>::template create<T>, name, hide, subTypes);
+		FactoryBase<func>::DoRegister(&Factory1<Base, Arg1>::template create<T>, name, hide, subTypes);
 	}
 };
diff --git a/aegisub/src/hotkey.cpp b/aegisub/src/hotkey.cpp
index 0443e64c6..fbb9c4b7a 100644
--- a/aegisub/src/hotkey.cpp
+++ b/aegisub/src/hotkey.cpp
@@ -45,7 +45,6 @@ void clear() {
 
 static std::vector<std::string> keycode_names;
 
-static std::string const& get_keycode_name(int code);
 static void init_keycode_names();
 
 static std::string const& keycode_name(int code) {
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 63600a8a6..286b3609a 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -704,7 +704,7 @@ void SubsEditBox::SetTag(wxString tag, wxString value, bool atEnd) {
 		AssDialogueBlock *block = line->Blocks[blockn];
 		if (dynamic_cast<AssDialogueBlockDrawing*>(block))
 			--blockn;
-		else if (plain = dynamic_cast<AssDialogueBlockPlain*>(block)) {
+		else if ((plain = dynamic_cast<AssDialogueBlockPlain*>(block))) {
 			// Cursor is in a comment block, so try the previous block instead
 			if (plain->GetText().StartsWith("{")) {
 				--blockn;