diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 58346ac66..0a84db7a5 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -1331,14 +1331,6 @@
 				RelativePath="..\..\src\main.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\options.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\plugin_manager.cpp"
 				>
diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am
index ba4c19e9c..d370a7bcf 100644
--- a/aegisub/src/Makefile.am
+++ b/aegisub/src/Makefile.am
@@ -267,7 +267,6 @@ aegisub_2_2_SOURCES = \
 	md5.c \
 	mkv_wrap.cpp \
 	mythes.cxx \
-	options.cpp \
 	plugin_manager.cpp \
 	preferences.cpp \
 	scintilla_text_ctrl.cpp \
diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp
index dc061e83a..a6fe1bba5 100644
--- a/aegisub/src/ass_file.cpp
+++ b/aegisub/src/ass_file.cpp
@@ -54,7 +54,6 @@
 #include "charset_detect.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "subtitle_format.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index dbb736c90..575b755c5 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -57,7 +57,6 @@
 #include "hotkeys.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "toggle_bitmap.h"
 #include "tooltip_manager.h"
 
diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index e4126148e..7c841564d 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -59,7 +59,6 @@
 #include "fft.h"
 #include "hotkeys.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
diff --git a/aegisub/src/audio_player.cpp b/aegisub/src/audio_player.cpp
index 8d354f939..dc01dc053 100644
--- a/aegisub/src/audio_player.cpp
+++ b/aegisub/src/audio_player.cpp
@@ -61,7 +61,6 @@
 #endif
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 
 
 
diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp
index 4e2c01ffa..1cc3ddf83 100644
--- a/aegisub/src/audio_player_alsa.cpp
+++ b/aegisub/src/audio_player_alsa.cpp
@@ -51,7 +51,6 @@
 #include "main.h"
 #include "compat.h"
 #include "frame_main.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/audio_player_alsa.h b/aegisub/src/audio_player_alsa.h
index e4f2ba5be..ab4e28cd9 100644
--- a/aegisub/src/audio_player_alsa.h
+++ b/aegisub/src/audio_player_alsa.h
@@ -44,7 +44,6 @@
 
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/audio_player_dsound2.cpp b/aegisub/src/audio_player_dsound2.cpp
index 416f1b7d9..2d3969223 100644
--- a/aegisub/src/audio_player_dsound2.cpp
+++ b/aegisub/src/audio_player_dsound2.cpp
@@ -53,7 +53,6 @@
 #include "frame_main.h"
 #include "include/aegisub/audio_provider.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/audio_player_openal.cpp b/aegisub/src/audio_player_openal.cpp
index b0149fb36..f68ed05b1 100644
--- a/aegisub/src/audio_player_openal.cpp
+++ b/aegisub/src/audio_player_openal.cpp
@@ -48,7 +48,6 @@
 #include "audio_player_openal.h"
 #include "audio_provider_manager.h"
 #include "frame_main.h"
-#include "options.h"
 #include "utils.h"
 
 #ifdef __WINDOWS__
diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h
index 8ecbc3388..4c2a1ddd3 100644
--- a/aegisub/src/audio_player_openal.h
+++ b/aegisub/src/audio_player_openal.h
@@ -43,7 +43,6 @@
 #include "audio_player_manager.h"
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 #ifdef __WINDOWS__
diff --git a/aegisub/src/audio_player_oss.cpp b/aegisub/src/audio_player_oss.cpp
index 6d2e6b4be..f28eb430f 100644
--- a/aegisub/src/audio_player_oss.cpp
+++ b/aegisub/src/audio_player_oss.cpp
@@ -47,7 +47,6 @@
 #include "frame_main.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/audio_player_oss.h b/aegisub/src/audio_player_oss.h
index 96e97d0ba..4cb6c9749 100644
--- a/aegisub/src/audio_player_oss.h
+++ b/aegisub/src/audio_player_oss.h
@@ -56,7 +56,6 @@
 
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/audio_player_portaudio.cpp b/aegisub/src/audio_player_portaudio.cpp
index 5dcbe35cb..3d9c39f09 100644
--- a/aegisub/src/audio_player_portaudio.cpp
+++ b/aegisub/src/audio_player_portaudio.cpp
@@ -47,7 +47,6 @@
 #include "audio_provider_manager.h"
 #include "charset_conv.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 #include <wx/log.h>
 
diff --git a/aegisub/src/audio_player_pulse.cpp b/aegisub/src/audio_player_pulse.cpp
index 2ea749005..d718cbd32 100644
--- a/aegisub/src/audio_player_pulse.cpp
+++ b/aegisub/src/audio_player_pulse.cpp
@@ -48,7 +48,6 @@
 
 #include "audio_player_pulse.h"
 #include "audio_provider_manager.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/audio_player_pulse.h b/aegisub/src/audio_player_pulse.h
index a7f6c9e5d..af0debf5b 100644
--- a/aegisub/src/audio_player_pulse.h
+++ b/aegisub/src/audio_player_pulse.h
@@ -48,7 +48,6 @@
 
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp
index 62ee5d85a..75f242763 100644
--- a/aegisub/src/audio_provider.cpp
+++ b/aegisub/src/audio_provider.cpp
@@ -59,7 +59,6 @@
 #include "audio_provider_ram.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 
 
 
diff --git a/aegisub/src/audio_provider_avs.cpp b/aegisub/src/audio_provider_avs.cpp
index a3d778ede..995bda797 100644
--- a/aegisub/src/audio_provider_avs.cpp
+++ b/aegisub/src/audio_provider_avs.cpp
@@ -53,7 +53,6 @@
 #include "charset_conv.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "utils.h"
 
diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp
index 2d9b50203..fd6897062 100644
--- a/aegisub/src/audio_provider_ffmpegsource.cpp
+++ b/aegisub/src/audio_provider_ffmpegsource.cpp
@@ -51,7 +51,6 @@
 #include "audio_provider_ffmpegsource.h"
 #include "include/aegisub/aegisub.h"
 #include "main.h"
-#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/audio_provider_hd.cpp b/aegisub/src/audio_provider_hd.cpp
index 5d6eb1fce..8ada334b8 100644
--- a/aegisub/src/audio_provider_hd.cpp
+++ b/aegisub/src/audio_provider_hd.cpp
@@ -51,7 +51,6 @@
 #include "dialog_progress.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "utils.h"
 
diff --git a/aegisub/src/audio_renderer_spectrum.cpp b/aegisub/src/audio_renderer_spectrum.cpp
index e9e9cd4d2..ce17f7329 100644
--- a/aegisub/src/audio_renderer_spectrum.cpp
+++ b/aegisub/src/audio_renderer_spectrum.cpp
@@ -57,7 +57,6 @@
 #include "colorspace.h"
 #include "fft.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp
index b0dc0506d..dd7dc91e1 100644
--- a/aegisub/src/auto4_base.cpp
+++ b/aegisub/src/auto4_base.cpp
@@ -70,7 +70,6 @@
 #include "auto4_base.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "string_codec.h"
 
diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp
index 85b8c280a..d4a50e4d0 100644
--- a/aegisub/src/auto4_lua.cpp
+++ b/aegisub/src/auto4_lua.cpp
@@ -61,7 +61,6 @@
 #include "auto4_lua_factory.h"
 #include "auto4_lua_scriptreader.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "text_file_reader.h"
 #include "video_context.h"
diff --git a/aegisub/src/avisynth_wrap.cpp b/aegisub/src/avisynth_wrap.cpp
index 95a8aae02..6168cff39 100644
--- a/aegisub/src/avisynth_wrap.cpp
+++ b/aegisub/src/avisynth_wrap.cpp
@@ -43,7 +43,6 @@
 #ifdef WITH_AVISYNTH
 #include "avisynth_wrap.h"
 #include "main.h"
-#include "options.h"
 
 #ifdef DEBUG_AVISYNTH_CODE
 #ifndef AGI_PRE
diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index 2210ba23d..40d8b2d1e 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -50,7 +50,6 @@
 #include "compat.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "utils.h"
 #include "video_box.h"
diff --git a/aegisub/src/dialog_about.cpp b/aegisub/src/dialog_about.cpp
index 8a2b8e563..0b6a9ce25 100644
--- a/aegisub/src/dialog_about.cpp
+++ b/aegisub/src/dialog_about.cpp
@@ -51,7 +51,6 @@
 
 #include "dialog_about.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 #include "version.h"
 
 
diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp
index 8609df51a..41d1051f0 100644
--- a/aegisub/src/dialog_attachments.cpp
+++ b/aegisub/src/dialog_attachments.cpp
@@ -55,7 +55,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/dialog_automation.cpp b/aegisub/src/dialog_automation.cpp
index c74b698fa..93ee756b5 100644
--- a/aegisub/src/dialog_automation.cpp
+++ b/aegisub/src/dialog_automation.cpp
@@ -52,7 +52,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index b7b95512f..c22c65dbd 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -69,7 +69,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 /// DOCME
diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp
index 8c3299b77..257cf3510 100644
--- a/aegisub/src/dialog_detached_video.cpp
+++ b/aegisub/src/dialog_detached_video.cpp
@@ -45,7 +45,6 @@
 #include "dialog_detached_video.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "video_box.h"
 #include "video_context.h"
 #include "video_display.h"
diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp
index 401f767a0..33bab32e9 100644
--- a/aegisub/src/dialog_dummy_video.cpp
+++ b/aegisub/src/dialog_dummy_video.cpp
@@ -48,7 +48,6 @@
 #include "dialog_dummy_video.h"
 #include "help_button.h"
 #include "main.h"
-#include "options.h"
 #include "utils.h"
 
 /// DOCME
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index 30d0eebb2..7047e1654 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -58,7 +58,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "scintilla_text_ctrl.h"
 #include "subs_grid.h"
 #include "utils.h"
diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h
index 2b50247c5..e2e3b0a5a 100644
--- a/aegisub/src/dialog_kara_timing_copy.h
+++ b/aegisub/src/dialog_kara_timing_copy.h
@@ -52,7 +52,6 @@
 #include "ass_entry.h"
 #include "ass_file.h"
 #include "kana_table.h"
-#include "options.h"
 
 
 //////////////
diff --git a/aegisub/src/dialog_paste_over.cpp b/aegisub/src/dialog_paste_over.cpp
index 8b101353d..883eaab15 100644
--- a/aegisub/src/dialog_paste_over.cpp
+++ b/aegisub/src/dialog_paste_over.cpp
@@ -46,7 +46,6 @@
 #include "dialog_paste_over.h"
 #include "help_button.h"
 #include "main.h"
-#include "options.h"
 
 /// Button IDs
 enum {
diff --git a/aegisub/src/dialog_properties.cpp b/aegisub/src/dialog_properties.cpp
index 10dde4de2..406e47d44 100644
--- a/aegisub/src/dialog_properties.cpp
+++ b/aegisub/src/dialog_properties.cpp
@@ -47,7 +47,6 @@
 #include "dialog_properties.h"
 #include "help_button.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 #include "utils.h"
 #include "validators.h"
 #include "video_context.h"
diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp
index 9df698444..204ac6ec9 100644
--- a/aegisub/src/dialog_search_replace.cpp
+++ b/aegisub/src/dialog_search_replace.cpp
@@ -50,7 +50,6 @@
 #include "dialog_search_replace.h"
 #include "frame_main.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "video_display.h"
diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp
index 61eaac4c4..030023e99 100644
--- a/aegisub/src/dialog_selection.cpp
+++ b/aegisub/src/dialog_selection.cpp
@@ -49,7 +49,6 @@
 #include "dialog_selection.h"
 #include "help_button.h"
 #include "main.h"
-#include "options.h"
 #include "subs_grid.h"
 #include "subs_edit_box.h"
 
diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index 196f72eaf..3cb01192e 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -56,7 +56,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp
index 8355aba13..265cedc6d 100644
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@@ -50,7 +50,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "spellchecker_manager.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
diff --git a/aegisub/src/dialog_splash.cpp b/aegisub/src/dialog_splash.cpp
index 35ff46edd..a5268ef7a 100644
--- a/aegisub/src/dialog_splash.cpp
+++ b/aegisub/src/dialog_splash.cpp
@@ -48,7 +48,6 @@
 #include "dialog_splash.h"
 #include "dialog_tip.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index e36b8b43a..b3e48b802 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -55,7 +55,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_grid.h"
 #include "subs_preview.h"
 #include "subtitles_provider_manager.h"
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index f36c21f25..0d62292f2 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -53,7 +53,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_grid.h"
 #include "utils.h"
diff --git a/aegisub/src/dialog_text_import.cpp b/aegisub/src/dialog_text_import.cpp
index 1aeec8af1..9d7ca9aa4 100644
--- a/aegisub/src/dialog_text_import.cpp
+++ b/aegisub/src/dialog_text_import.cpp
@@ -47,7 +47,6 @@
 #include "compat.h"
 #include "dialog_text_import.h"
 #include "main.h"
-#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp
index 390edd37b..0e634bfc1 100644
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@@ -43,7 +43,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_grid.h"
 #include "utils.h"
 #include "validators.h"
diff --git a/aegisub/src/dialog_tip.cpp b/aegisub/src/dialog_tip.cpp
index 060bf324c..85c4a4af8 100644
--- a/aegisub/src/dialog_tip.cpp
+++ b/aegisub/src/dialog_tip.cpp
@@ -46,7 +46,6 @@
 
 #include "dialog_tip.h"
 #include "main.h"
-#include "options.h"
 
 
 /// @brief Constructor 
diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp
index 7d77df93a..e8a0adde7 100644
--- a/aegisub/src/dialog_translation.cpp
+++ b/aegisub/src/dialog_translation.cpp
@@ -51,7 +51,6 @@
 #include "help_button.h"
 #include "hotkeys.h"
 #include "libresrc/libresrc.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"
diff --git a/aegisub/src/dialog_version_check.cpp b/aegisub/src/dialog_version_check.cpp
index dfaa6a860..2c3e6173b 100644
--- a/aegisub/src/dialog_version_check.cpp
+++ b/aegisub/src/dialog_version_check.cpp
@@ -68,7 +68,6 @@
 #include "compat.h"
 #include "dialog_version_check.h"
 #include "main.h"
-#include "options.h"
 #include "string_codec.h"
 #include "version.h"
 
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index 77c9d9959..71087285d 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -53,7 +53,6 @@
 #include "frame_main.h"
 #include "main.h"
 #include "md5.h"
-#include "options.h"
 #include "standard_paths.h"
 
 
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 0209055f7..0e9c1e7c6 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -71,7 +71,6 @@
 #include "keyframe.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp
index c6d7786f8..a131d94af 100644
--- a/aegisub/src/frame_main_events.cpp
+++ b/aegisub/src/frame_main_events.cpp
@@ -82,7 +82,6 @@
 #include "keyframe.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "preferences.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
diff --git a/aegisub/src/gl_wrap.cpp b/aegisub/src/gl_wrap.cpp
index 062f4a9fb..8772deea4 100644
--- a/aegisub/src/gl_wrap.cpp
+++ b/aegisub/src/gl_wrap.cpp
@@ -50,7 +50,6 @@
 
 #endif
 
-#include "options.h"
 
 /// @brief Constructor 
 ///
diff --git a/aegisub/src/keyframe.cpp b/aegisub/src/keyframe.cpp
index 1a8252b1e..b26898cfd 100644
--- a/aegisub/src/keyframe.cpp
+++ b/aegisub/src/keyframe.cpp
@@ -43,7 +43,6 @@
 #include "compat.h"
 #include "keyframe.h"
 #include "main.h"
-#include "options.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
 #include "video_context.h"
diff --git a/aegisub/src/options.cpp b/aegisub/src/options.cpp
deleted file mode 100644
index 09215c9a7..000000000
--- a/aegisub/src/options.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2005-2007, Rodrigo Braz Monteiro
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name of the Aegisub Group nor the names of its contributors
-//     may be used to endorse or promote products derived from this software
-//     without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Aegisub Project http://www.aegisub.org/
-//
-// $Id$
-
-/// @file options.cpp
-/// @brief Initialise, load and store configuration settings, including all defaults
-/// @ingroup main
-///
-
-
diff --git a/aegisub/src/options.h b/aegisub/src/options.h
deleted file mode 100644
index 69faef31f..000000000
--- a/aegisub/src/options.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2005, Rodrigo Braz Monteiro
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name of the Aegisub Group nor the names of its contributors
-//     may be used to endorse or promote products derived from this software
-//     without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Aegisub Project http://www.aegisub.org/
-//
-// $Id$
-
-/// @file options.h
-/// @see options.cpp
-/// @ingroup main
-///
-
-
-
-
diff --git a/aegisub/src/spellchecker.cpp b/aegisub/src/spellchecker.cpp
index a2723ac74..606f296de 100644
--- a/aegisub/src/spellchecker.cpp
+++ b/aegisub/src/spellchecker.cpp
@@ -45,7 +45,6 @@
 
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "spellchecker_manager.h"
 
 
diff --git a/aegisub/src/spellchecker_hunspell.cpp b/aegisub/src/spellchecker_hunspell.cpp
index a9f22dba9..5bbf40c40 100644
--- a/aegisub/src/spellchecker_hunspell.cpp
+++ b/aegisub/src/spellchecker_hunspell.cpp
@@ -56,7 +56,6 @@
 #include "charset_conv.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "spellchecker_hunspell.h"
 #include "standard_paths.h"
 #include "text_file_reader.h"
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 9b4b87171..65c11431b 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -56,7 +56,6 @@
 #include "idle_field_event.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "timeedit_ctrl.h"
diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp
index 3a77de639..fd4d1f21e 100644
--- a/aegisub/src/subs_edit_ctrl.cpp
+++ b/aegisub/src/subs_edit_ctrl.cpp
@@ -46,7 +46,6 @@
 #include "ass_dialogue.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index 064917b98..55fa9be9f 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -54,7 +54,6 @@
 #include "frame_main.h"
 #include "hotkeys.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"
diff --git a/aegisub/src/subtitle_format_ttxt.cpp b/aegisub/src/subtitle_format_ttxt.cpp
index 6ca68c5bf..1627212eb 100644
--- a/aegisub/src/subtitle_format_ttxt.cpp
+++ b/aegisub/src/subtitle_format_ttxt.cpp
@@ -43,7 +43,6 @@
 #include "ass_time.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "subtitle_format_ttxt.h"
 
 
diff --git a/aegisub/src/subtitle_format_txt.cpp b/aegisub/src/subtitle_format_txt.cpp
index 22ccd874e..49ef3f3d4 100644
--- a/aegisub/src/subtitle_format_txt.cpp
+++ b/aegisub/src/subtitle_format_txt.cpp
@@ -43,7 +43,6 @@
 #include "compat.h"
 #include "dialog_text_import.h"
 #include "main.h"
-#include "options.h"
 #include "subtitle_format_txt.h"
 #include "text_file_reader.h"
 #include "text_file_writer.h"
diff --git a/aegisub/src/subtitles_provider.cpp b/aegisub/src/subtitles_provider.cpp
index 5ba4c0d26..f5a084d21 100644
--- a/aegisub/src/subtitles_provider.cpp
+++ b/aegisub/src/subtitles_provider.cpp
@@ -41,7 +41,6 @@
 
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #ifdef WITH_CSRI
 #include "subtitles_provider_csri.h"
 #endif
diff --git a/aegisub/src/text_file_writer.cpp b/aegisub/src/text_file_writer.cpp
index c4a328ff9..cc875b554 100644
--- a/aegisub/src/text_file_writer.cpp
+++ b/aegisub/src/text_file_writer.cpp
@@ -43,7 +43,6 @@
 #include "charset_conv.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "text_file_writer.h"
 
 
diff --git a/aegisub/src/thesaurus_myspell.cpp b/aegisub/src/thesaurus_myspell.cpp
index a0387b5b5..176fd39c8 100644
--- a/aegisub/src/thesaurus_myspell.cpp
+++ b/aegisub/src/thesaurus_myspell.cpp
@@ -50,7 +50,6 @@
 #include "compat.h"
 #include "mythes.hxx"
 #include "main.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "thesaurus_myspell.h"
 #include "utils.h"
diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp
index 203b574fd..f280f028e 100644
--- a/aegisub/src/timeedit_ctrl.cpp
+++ b/aegisub/src/timeedit_ctrl.cpp
@@ -46,7 +46,6 @@
 #include "ass_time.h"
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 #include "timeedit_ctrl.h"
 #include "video_context.h"
 
diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp
index 0cadb9850..70d43f2b4 100644
--- a/aegisub/src/video_box.cpp
+++ b/aegisub/src/video_box.cpp
@@ -53,7 +53,6 @@
 #include "help_button.h"
 #include "libresrc/libresrc.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "toggle_bitmap.h"
diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp
index ddb07704c..d0b9a5c5a 100644
--- a/aegisub/src/video_context.cpp
+++ b/aegisub/src/video_context.cpp
@@ -64,7 +64,6 @@
 #include <libaegisub/access.h>
 #include "main.h"
 #include "mkv_wrap.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index e30a80c31..6206e6dce 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -58,7 +58,6 @@
 
 #include "ass_dialogue.h"
 #include "hotkeys.h"
-#include "options.h"
 #include "main.h"
 #include "subs_grid.h"
 #include "video_out_gl.h"
diff --git a/aegisub/src/video_provider_avs.cpp b/aegisub/src/video_provider_avs.cpp
index c1e983bee..2db73860f 100644
--- a/aegisub/src/video_provider_avs.cpp
+++ b/aegisub/src/video_provider_avs.cpp
@@ -48,7 +48,6 @@
 #include "charset_conv.h"
 #include "gl_wrap.h"
 #include "mkv_wrap.h"
-#include "options.h"
 #include "standard_paths.h"
 #include "vfw_wrap.h"
 #include "video_context.h"
diff --git a/aegisub/src/video_provider_cache.cpp b/aegisub/src/video_provider_cache.cpp
index 85692c1b2..ab7749b74 100644
--- a/aegisub/src/video_provider_cache.cpp
+++ b/aegisub/src/video_provider_cache.cpp
@@ -36,7 +36,6 @@
 
 #include "config.h"
 #include "main.h"
-#include "options.h"
 
 #include "video_provider_cache.h"
 
diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp
index 91e40f3f6..fe0a9dbd0 100644
--- a/aegisub/src/video_provider_ffmpegsource.cpp
+++ b/aegisub/src/video_provider_ffmpegsource.cpp
@@ -53,7 +53,6 @@
 #include "aegisub_endian.h"
 #include "include/aegisub/aegisub.h"
 #include "main.h"
-#include "options.h"
 #include "video_context.h"
 #include "video_provider_ffmpegsource.h"
 
diff --git a/aegisub/src/video_provider_manager.cpp b/aegisub/src/video_provider_manager.cpp
index 12766dfbf..0ec30f4ba 100644
--- a/aegisub/src/video_provider_manager.cpp
+++ b/aegisub/src/video_provider_manager.cpp
@@ -40,7 +40,6 @@
 
 #include "compat.h"
 #include "main.h"
-#include "options.h"
 
 #ifdef WITH_AVISYNTH
 #include "video_provider_avs.h"
diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp
index bb0f2477f..3e45bb845 100644
--- a/aegisub/src/video_slider.cpp
+++ b/aegisub/src/video_slider.cpp
@@ -45,7 +45,6 @@
 
 #include "ass_dialogue.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index 3d691e8ce..c2d934575 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -53,7 +53,6 @@
 #include "ass_time.h"
 #include "export_visible_lines.h"
 #include "main.h"
-#include "options.h"
 #include "subs_edit_box.h"
 #include "subs_grid.h"
 #include "utils.h"