diff --git a/aegisub/automation/autoload/clean-info.lua b/aegisub/automation/autoload/clean-info.lua
index f28dfa182..4cf0fdd78 100644
--- a/aegisub/automation/autoload/clean-info.lua
+++ b/aegisub/automation/autoload/clean-info.lua
@@ -11,8 +11,6 @@
 -- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---
--- $Id$
 
 local tr = aegisub.gettext
 
diff --git a/aegisub/automation/autoload/select-overlaps.lua b/aegisub/automation/autoload/select-overlaps.lua
index 35bb38bce..e6bf44f79 100644
--- a/aegisub/automation/autoload/select-overlaps.lua
+++ b/aegisub/automation/autoload/select-overlaps.lua
@@ -11,8 +11,6 @@
 -- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---
--- $Id$
 
 local tr = aegisub.gettext
 
diff --git a/aegisub/automation/autoload/strip-tags.lua b/aegisub/automation/autoload/strip-tags.lua
index 4e0f9f92d..ffe1b90d1 100644
--- a/aegisub/automation/autoload/strip-tags.lua
+++ b/aegisub/automation/autoload/strip-tags.lua
@@ -11,8 +11,6 @@
 -- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---
--- $Id$
 
 local tr = aegisub.gettext
 
diff --git a/aegisub/automation/include/clipboard.lua b/aegisub/automation/include/clipboard.lua
index 55588d7b1..5033add1b 100644
--- a/aegisub/automation/include/clipboard.lua
+++ b/aegisub/automation/include/clipboard.lua
@@ -11,8 +11,6 @@
 -- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---
--- $Id$
 
 _G.clipboard = aegisub.__init_clipboard()
 return _G.clipboard
diff --git a/aegisub/automation/include/re.lua b/aegisub/automation/include/re.lua
index 47f55d490..1de7aa7e3 100644
--- a/aegisub/automation/include/re.lua
+++ b/aegisub/automation/include/re.lua
@@ -11,8 +11,6 @@
 -- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---
--- $Id$
 
 -- Get the wxRegex binding
 local regex = aegisub.__init_regex()
diff --git a/aegisub/libaegisub/Makefile b/aegisub/libaegisub/Makefile
index 731649791..ff397da52 100644
--- a/aegisub/libaegisub/Makefile
+++ b/aegisub/libaegisub/Makefile
@@ -1,4 +1,3 @@
-# $Id$
 include ../Makefile.inc
 
 LIB = libaegisub.a
diff --git a/aegisub/libaegisub/common/charset.cpp b/aegisub/libaegisub/common/charset.cpp
index 83c80b97a..4c7024859 100644
--- a/aegisub/libaegisub/common/charset.cpp
+++ b/aegisub/libaegisub/common/charset.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset.cpp
 /// @brief Character set detection and manipulation utilities.
diff --git a/aegisub/libaegisub/common/charset_6937.cpp b/aegisub/libaegisub/common/charset_6937.cpp
index d86396e40..3120a54c5 100644
--- a/aegisub/libaegisub/common/charset_6937.cpp
+++ b/aegisub/libaegisub/common/charset_6937.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_6937.cpp
 /// @brief A charset converter for ISO-6937-2
diff --git a/aegisub/libaegisub/common/charset_6937.h b/aegisub/libaegisub/common/charset_6937.h
index 60e9594c9..b485404f1 100644
--- a/aegisub/libaegisub/common/charset_6937.h
+++ b/aegisub/libaegisub/common/charset_6937.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_6937.h
 /// @brief A charset converter for ISO-6937-2
diff --git a/aegisub/libaegisub/common/charset_conv.cpp b/aegisub/libaegisub/common/charset_conv.cpp
index 566312c3d..6ec90b489 100644
--- a/aegisub/libaegisub/common/charset_conv.cpp
+++ b/aegisub/libaegisub/common/charset_conv.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_conv.cpp
 /// @brief Wrapper for libiconv to present a more C++-friendly API
diff --git a/aegisub/libaegisub/common/charset_ucd.cpp b/aegisub/libaegisub/common/charset_ucd.cpp
index aae10bc4a..c2a533f15 100644
--- a/aegisub/libaegisub/common/charset_ucd.cpp
+++ b/aegisub/libaegisub/common/charset_ucd.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_ucd.cpp
 /// @brief Character set detection using Universalchardet
diff --git a/aegisub/libaegisub/common/charset_ucd.h b/aegisub/libaegisub/common/charset_ucd.h
index 98e1ed832..ed7c92825 100644
--- a/aegisub/libaegisub/common/charset_ucd.h
+++ b/aegisub/libaegisub/common/charset_ucd.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_ucd.h
 /// @brief Character set detection using Universalchardet
diff --git a/aegisub/libaegisub/common/hotkey.cpp b/aegisub/libaegisub/common/hotkey.cpp
index 2bea180e3..a40efe783 100644
--- a/aegisub/libaegisub/common/hotkey.cpp
+++ b/aegisub/libaegisub/common/hotkey.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file hotkey.cpp
 /// @brief Hotkey handler
diff --git a/aegisub/libaegisub/common/json.cpp b/aegisub/libaegisub/common/json.cpp
index 73a28f2e2..8a1c27f13 100644
--- a/aegisub/libaegisub/common/json.cpp
+++ b/aegisub/libaegisub/common/json.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file json.cpp
 /// @brief Parse JSON files and return json::UnknownElement
diff --git a/aegisub/libaegisub/common/keyframe.cpp b/aegisub/libaegisub/common/keyframe.cpp
index abd98ea5b..24e9f7702 100644
--- a/aegisub/libaegisub/common/keyframe.cpp
+++ b/aegisub/libaegisub/common/keyframe.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file keyframe.cpp
 /// @see keyframe.h
diff --git a/aegisub/libaegisub/common/log.cpp b/aegisub/libaegisub/common/log.cpp
index daafda2ef..da92272bb 100644
--- a/aegisub/libaegisub/common/log.cpp
+++ b/aegisub/libaegisub/common/log.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file log.cpp
 /// @brief Logging
diff --git a/aegisub/libaegisub/common/mru.cpp b/aegisub/libaegisub/common/mru.cpp
index d76701342..c6917c4c1 100644
--- a/aegisub/libaegisub/common/mru.cpp
+++ b/aegisub/libaegisub/common/mru.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file mru.cpp
 /// @brief Most Recently Used (MRU) Lists
diff --git a/aegisub/libaegisub/common/option.cpp b/aegisub/libaegisub/common/option.cpp
index 77f477060..fd89ceeb2 100644
--- a/aegisub/libaegisub/common/option.cpp
+++ b/aegisub/libaegisub/common/option.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file option.cpp
 /// @brief Option interface.
diff --git a/aegisub/libaegisub/common/option_visit.cpp b/aegisub/libaegisub/common/option_visit.cpp
index f3b84c681..21e52fb9e 100644
--- a/aegisub/libaegisub/common/option_visit.cpp
+++ b/aegisub/libaegisub/common/option_visit.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file option_visit.cpp
 /// @brief Cajun JSON visitor to load config values.
diff --git a/aegisub/libaegisub/common/option_visit.h b/aegisub/libaegisub/common/option_visit.h
index 943896204..82d8a5693 100644
--- a/aegisub/libaegisub/common/option_visit.h
+++ b/aegisub/libaegisub/common/option_visit.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file option_visit.h
 /// @brief Cajun JSON visitor to load config values.
diff --git a/aegisub/libaegisub/common/thesaurus.cpp b/aegisub/libaegisub/common/thesaurus.cpp
index 8359a3db7..50127d620 100644
--- a/aegisub/libaegisub/common/thesaurus.cpp
+++ b/aegisub/libaegisub/common/thesaurus.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file thesaurus.cpp
 /// @brief MyThes-compatible thesaurus implementation
diff --git a/aegisub/libaegisub/common/util.cpp b/aegisub/libaegisub/common/util.cpp
index 355a5d735..ee345536a 100644
--- a/aegisub/libaegisub/common/util.cpp
+++ b/aegisub/libaegisub/common/util.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file util.cpp
 /// @brief Unix utility methods.
diff --git a/aegisub/libaegisub/common/vfr.cpp b/aegisub/libaegisub/common/vfr.cpp
index 05bcd684e..a92dee04b 100644
--- a/aegisub/libaegisub/common/vfr.cpp
+++ b/aegisub/libaegisub/common/vfr.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file vfr.cpp
 /// @brief Framerate handling of all sorts
diff --git a/aegisub/libaegisub/include/libaegisub/access.h b/aegisub/libaegisub/include/libaegisub/access.h
index 1ef9c7200..ee5ecb01e 100644
--- a/aegisub/libaegisub/include/libaegisub/access.h
+++ b/aegisub/libaegisub/include/libaegisub/access.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file access.h
 /// @brief Public interface for access methods.
diff --git a/aegisub/libaegisub/include/libaegisub/background_runner.h b/aegisub/libaegisub/include/libaegisub/background_runner.h
index 7ae72e886..2f009aca8 100644
--- a/aegisub/libaegisub/include/libaegisub/background_runner.h
+++ b/aegisub/libaegisub/include/libaegisub/background_runner.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file background_runner.h
 /// @brief Background runner and progress sink interfaces
diff --git a/aegisub/libaegisub/include/libaegisub/charset.h b/aegisub/libaegisub/include/libaegisub/charset.h
index e41cd8da4..a1c652c85 100644
--- a/aegisub/libaegisub/include/libaegisub/charset.h
+++ b/aegisub/libaegisub/include/libaegisub/charset.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset.h
 /// @brief Character set detection and manipulation utilities.
diff --git a/aegisub/libaegisub/include/libaegisub/charset_conv.h b/aegisub/libaegisub/include/libaegisub/charset_conv.h
index f19f968d7..b95b6aff2 100644
--- a/aegisub/libaegisub/include/libaegisub/charset_conv.h
+++ b/aegisub/libaegisub/include/libaegisub/charset_conv.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_conv.h
 /// @brief Wrapper for libiconv to present a more C++-friendly API
diff --git a/aegisub/libaegisub/include/libaegisub/charset_conv_win.h b/aegisub/libaegisub/include/libaegisub/charset_conv_win.h
index 00dda5322..f7551daa9 100644
--- a/aegisub/libaegisub/include/libaegisub/charset_conv_win.h
+++ b/aegisub/libaegisub/include/libaegisub/charset_conv_win.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_conv_win.h
 /// @brief Windows-specific charset conversion stuff
diff --git a/aegisub/libaegisub/include/libaegisub/colour.h b/aegisub/libaegisub/include/libaegisub/colour.h
index fc35eeb5e..905e92f07 100644
--- a/aegisub/libaegisub/include/libaegisub/colour.h
+++ b/aegisub/libaegisub/include/libaegisub/colour.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file colour.h
 /// @brief Colourspace class and functions.
diff --git a/aegisub/libaegisub/include/libaegisub/exception.h b/aegisub/libaegisub/include/libaegisub/exception.h
index b6b28b355..9d8e07efe 100644
--- a/aegisub/libaegisub/include/libaegisub/exception.h
+++ b/aegisub/libaegisub/include/libaegisub/exception.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file exception.h
 /// @brief Base exception classes for structured error handling
diff --git a/aegisub/libaegisub/include/libaegisub/hotkey.h b/aegisub/libaegisub/include/libaegisub/hotkey.h
index 416f6938f..ac1c75e4f 100644
--- a/aegisub/libaegisub/include/libaegisub/hotkey.h
+++ b/aegisub/libaegisub/include/libaegisub/hotkey.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file hotkey.h
 /// @brief Hotkey handler
diff --git a/aegisub/libaegisub/include/libaegisub/io.h b/aegisub/libaegisub/include/libaegisub/io.h
index bd363f2e4..c7bb01ac4 100644
--- a/aegisub/libaegisub/include/libaegisub/io.h
+++ b/aegisub/libaegisub/include/libaegisub/io.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file io.h
 /// @brief Public interface for IO methods.
diff --git a/aegisub/libaegisub/include/libaegisub/json.h b/aegisub/libaegisub/include/libaegisub/json.h
index 54224270a..04adc8d22 100644
--- a/aegisub/libaegisub/include/libaegisub/json.h
+++ b/aegisub/libaegisub/include/libaegisub/json.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file json.h
 /// @brief Parse JSON files and return json::UnknownElement
diff --git a/aegisub/libaegisub/include/libaegisub/keyframe.h b/aegisub/libaegisub/include/libaegisub/keyframe.h
index 0b28b828b..6737ff2a6 100644
--- a/aegisub/libaegisub/include/libaegisub/keyframe.h
+++ b/aegisub/libaegisub/include/libaegisub/keyframe.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file keyframe.h
 /// @see keyframe.cpp
diff --git a/aegisub/libaegisub/include/libaegisub/line_iterator.h b/aegisub/libaegisub/include/libaegisub/line_iterator.h
index 425f3af97..44fe62f96 100644
--- a/aegisub/libaegisub/include/libaegisub/line_iterator.h
+++ b/aegisub/libaegisub/include/libaegisub/line_iterator.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file line_iterator.h
 /// @brief An iterator over lines in a stream
diff --git a/aegisub/libaegisub/include/libaegisub/line_wrap.h b/aegisub/libaegisub/include/libaegisub/line_wrap.h
index 76ed31e8b..8d007231a 100644
--- a/aegisub/libaegisub/include/libaegisub/line_wrap.h
+++ b/aegisub/libaegisub/include/libaegisub/line_wrap.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file line_wrap.h
 /// @brief Generic paragraph formatting logic
diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h
index 7dbbd836d..d732e6926 100644
--- a/aegisub/libaegisub/include/libaegisub/log.h
+++ b/aegisub/libaegisub/include/libaegisub/log.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file log.h
 /// @brief Logging
diff --git a/aegisub/libaegisub/include/libaegisub/mru.h b/aegisub/libaegisub/include/libaegisub/mru.h
index 5ebfa970f..3632cfc62 100644
--- a/aegisub/libaegisub/include/libaegisub/mru.h
+++ b/aegisub/libaegisub/include/libaegisub/mru.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file mru.h
 /// @brief Public interface for MRU (Most Recently Used) lists.
diff --git a/aegisub/libaegisub/include/libaegisub/option.h b/aegisub/libaegisub/include/libaegisub/option.h
index ea4c7ac81..678024697 100644
--- a/aegisub/libaegisub/include/libaegisub/option.h
+++ b/aegisub/libaegisub/include/libaegisub/option.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file option.h
 /// @brief Public interface for option values.
diff --git a/aegisub/libaegisub/include/libaegisub/option_value.h b/aegisub/libaegisub/include/libaegisub/option_value.h
index e767a0932..6af3294f9 100644
--- a/aegisub/libaegisub/include/libaegisub/option_value.h
+++ b/aegisub/libaegisub/include/libaegisub/option_value.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file option_value.h
 /// @brief Container for holding an actual option value.
diff --git a/aegisub/libaegisub/include/libaegisub/scoped_ptr.h b/aegisub/libaegisub/include/libaegisub/scoped_ptr.h
index 645c981a3..2b767a666 100644
--- a/aegisub/libaegisub/include/libaegisub/scoped_ptr.h
+++ b/aegisub/libaegisub/include/libaegisub/scoped_ptr.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id: scoped_ptr.h 153 2010-12-08 14:45:38Z verm $
 
 /// @file scoped_ptr.h
 /// @brief
diff --git a/aegisub/libaegisub/include/libaegisub/signal.h b/aegisub/libaegisub/include/libaegisub/signal.h
index 813bd7ec3..eaeafb3e5 100644
--- a/aegisub/libaegisub/include/libaegisub/signal.h
+++ b/aegisub/libaegisub/include/libaegisub/signal.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file signal.h
 /// @brief 
diff --git a/aegisub/libaegisub/include/libaegisub/thesaurus.h b/aegisub/libaegisub/include/libaegisub/thesaurus.h
index 8a7758f56..213b743b0 100644
--- a/aegisub/libaegisub/include/libaegisub/thesaurus.h
+++ b/aegisub/libaegisub/include/libaegisub/thesaurus.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file thesaurus.h
 /// @brief MyThes-compatible thesaurus implementation
diff --git a/aegisub/libaegisub/include/libaegisub/types.h b/aegisub/libaegisub/include/libaegisub/types.h
index d9a8f55bb..edaf28c70 100644
--- a/aegisub/libaegisub/include/libaegisub/types.h
+++ b/aegisub/libaegisub/include/libaegisub/types.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file types.h
 /// @brief Platform specific types.
diff --git a/aegisub/libaegisub/include/libaegisub/util.h b/aegisub/libaegisub/include/libaegisub/util.h
index 931313df0..96cfec756 100644
--- a/aegisub/libaegisub/include/libaegisub/util.h
+++ b/aegisub/libaegisub/include/libaegisub/util.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file util.h
 /// @brief Public interface for general utilities.
diff --git a/aegisub/libaegisub/include/libaegisub/util_osx.h b/aegisub/libaegisub/include/libaegisub/util_osx.h
index ed7eac4c1..7527ed9a5 100644
--- a/aegisub/libaegisub/include/libaegisub/util_osx.h
+++ b/aegisub/libaegisub/include/libaegisub/util_osx.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 
 /// @file util_osx.h
diff --git a/aegisub/libaegisub/include/libaegisub/util_win.h b/aegisub/libaegisub/include/libaegisub/util_win.h
index aea19ebe3..20683c823 100644
--- a/aegisub/libaegisub/include/libaegisub/util_win.h
+++ b/aegisub/libaegisub/include/libaegisub/util_win.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file util.h
 /// @brief Public interface for Windows utilities.
diff --git a/aegisub/libaegisub/include/libaegisub/vfr.h b/aegisub/libaegisub/include/libaegisub/vfr.h
index be1031c7f..4bc5298bc 100644
--- a/aegisub/libaegisub/include/libaegisub/vfr.h
+++ b/aegisub/libaegisub/include/libaegisub/vfr.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file vfr.h
 /// @brief Framerate handling of all sorts
diff --git a/aegisub/libaegisub/osx/util.mm b/aegisub/libaegisub/osx/util.mm
index 01164033d..9ed4f6274 100644
--- a/aegisub/libaegisub/osx/util.mm
+++ b/aegisub/libaegisub/osx/util.mm
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file util.mm
 /// @brief OSX Utilities
diff --git a/aegisub/libaegisub/unix/access.cpp b/aegisub/libaegisub/unix/access.cpp
index 88eae8e9e..f201f3cc2 100644
--- a/aegisub/libaegisub/unix/access.cpp
+++ b/aegisub/libaegisub/unix/access.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file access.cpp
 /// @brief Unix access methods.
diff --git a/aegisub/libaegisub/unix/log.cpp b/aegisub/libaegisub/unix/log.cpp
index f7cd450dd..6435653bc 100644
--- a/aegisub/libaegisub/unix/log.cpp
+++ b/aegisub/libaegisub/unix/log.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file log.cpp
 /// @brief Unix logging
diff --git a/aegisub/libaegisub/unix/util.cpp b/aegisub/libaegisub/unix/util.cpp
index 3b831644b..8fbbbece6 100644
--- a/aegisub/libaegisub/unix/util.cpp
+++ b/aegisub/libaegisub/unix/util.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file util.cpp
 /// @brief Unix utility methods.
diff --git a/aegisub/libaegisub/windows/access.cpp b/aegisub/libaegisub/windows/access.cpp
index 2136092e1..38ab15cd2 100644
--- a/aegisub/libaegisub/windows/access.cpp
+++ b/aegisub/libaegisub/windows/access.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file access.cpp
 /// @brief Windows access methods.
diff --git a/aegisub/libaegisub/windows/charset_conv_win.cpp b/aegisub/libaegisub/windows/charset_conv_win.cpp
index e71c54ba7..ebfe9340d 100644
--- a/aegisub/libaegisub/windows/charset_conv_win.cpp
+++ b/aegisub/libaegisub/windows/charset_conv_win.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file charset_conv_win.h
 /// @brief Windows-specific charset conversion stuff
diff --git a/aegisub/libaegisub/windows/log_win.cpp b/aegisub/libaegisub/windows/log_win.cpp
index 82c20eedd..a98810660 100644
--- a/aegisub/libaegisub/windows/log_win.cpp
+++ b/aegisub/libaegisub/windows/log_win.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file log.cpp
 /// @brief Windows logging
diff --git a/aegisub/libaegisub/windows/util_win.cpp b/aegisub/libaegisub/windows/util_win.cpp
index 158a45dca..2c84d1b11 100644
--- a/aegisub/libaegisub/windows/util_win.cpp
+++ b/aegisub/libaegisub/windows/util_win.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file util.cpp
 /// @brief Windows utility methods.
diff --git a/aegisub/src/MatroskaParser.c b/aegisub/src/MatroskaParser.c
index 84c2e2e2d..6942423dc 100644
--- a/aegisub/src/MatroskaParser.c
+++ b/aegisub/src/MatroskaParser.c
@@ -26,8 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file MatroskaParser.c
 /// @brief Haali's low-level Matroska-parsing library
diff --git a/aegisub/src/aegisub_endian.h b/aegisub/src/aegisub_endian.h
index 61eb8da1c..0d620eeca 100644
--- a/aegisub/src/aegisub_endian.h
+++ b/aegisub/src/aegisub_endian.h
@@ -25,8 +25,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file aegisub_endian.h
 /// @brief Convert numbers between various endianness
diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp
index a5f1f7835..2910d96ce 100644
--- a/aegisub/src/aegisublocale.cpp
+++ b/aegisub/src/aegisublocale.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file aegisublocale.cpp
 /// @brief Enumerate available locales for picking translation on Windows
diff --git a/aegisub/src/aegisublocale.h b/aegisub/src/aegisublocale.h
index c9074866a..e8a64cf63 100644
--- a/aegisub/src/aegisublocale.h
+++ b/aegisub/src/aegisublocale.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file aegisublocale.h
 /// @see aegisublocale.cpp
diff --git a/aegisub/src/agi_pre.cpp b/aegisub/src/agi_pre.cpp
index 1bc6fea6b..0d3b6c295 100644
--- a/aegisub/src/agi_pre.cpp
+++ b/aegisub/src/agi_pre.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file agi_pre.cpp
 /// @brief Precompiled headers control file, including stdwx.h only to generate precompiled header data
diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index c3963fc94..01281c182 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file agi_pre.h
 /// @brief Precompiled headers include file, including all headers that should be precompiled
diff --git a/aegisub/src/ass_attachment.cpp b/aegisub/src/ass_attachment.cpp
index 06514f436..f056e1c70 100644
--- a/aegisub/src/ass_attachment.cpp
+++ b/aegisub/src/ass_attachment.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_attachment.cpp
 /// @brief Manage files embedded in subtitles
diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h
index 3d9ee4987..a79a0fd08 100644
--- a/aegisub/src/ass_attachment.h
+++ b/aegisub/src/ass_attachment.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_attachment.h
 /// @see ass_attachment.cpp
diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index 96b7688cc..d951feb0e 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_dialogue.cpp
 /// @brief Class for dialogue lines in subtitles
diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h
index 04d14dd84..01902bb2f 100644
--- a/aegisub/src/ass_dialogue.h
+++ b/aegisub/src/ass_dialogue.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_dialogue.h
 /// @see ass_dialogue.cpp
diff --git a/aegisub/src/ass_entry.cpp b/aegisub/src/ass_entry.cpp
index f13accdf0..728173d01 100644
--- a/aegisub/src/ass_entry.cpp
+++ b/aegisub/src/ass_entry.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_entry.cpp
 /// @brief Superclass for different kinds of lines in subtitles
diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h
index 5200996e6..b9e63c719 100644
--- a/aegisub/src/ass_entry.h
+++ b/aegisub/src/ass_entry.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_entry.h
 /// @see ass_entry.cpp
diff --git a/aegisub/src/ass_export_filter.cpp b/aegisub/src/ass_export_filter.cpp
index 8514fc9f0..1f9b6c9f5 100644
--- a/aegisub/src/ass_export_filter.cpp
+++ b/aegisub/src/ass_export_filter.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_export_filter.cpp
 /// @brief Baseclass for and management of single export filters
diff --git a/aegisub/src/ass_export_filter.h b/aegisub/src/ass_export_filter.h
index 093bd6bc5..32f1df6c0 100644
--- a/aegisub/src/ass_export_filter.h
+++ b/aegisub/src/ass_export_filter.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_export_filter.h
 /// @see ass_export_filter.cpp
diff --git a/aegisub/src/ass_exporter.cpp b/aegisub/src/ass_exporter.cpp
index 5b51c5469..e4832a36a 100644
--- a/aegisub/src/ass_exporter.cpp
+++ b/aegisub/src/ass_exporter.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_exporter.cpp
 /// @brief Overall set-up and management of export operations
diff --git a/aegisub/src/ass_exporter.h b/aegisub/src/ass_exporter.h
index 286001bb5..fe16e9a56 100644
--- a/aegisub/src/ass_exporter.h
+++ b/aegisub/src/ass_exporter.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_exporter.h
 /// @see ass_exporter.cpp
diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp
index 0d5310569..36197a131 100644
--- a/aegisub/src/ass_file.cpp
+++ b/aegisub/src/ass_file.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_file.cpp
 /// @brief Overall storage of subtitle files, undo management and more
diff --git a/aegisub/src/ass_file.h b/aegisub/src/ass_file.h
index 948fcf24f..736883730 100644
--- a/aegisub/src/ass_file.h
+++ b/aegisub/src/ass_file.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_file.h
 /// @see ass_file.cpp
diff --git a/aegisub/src/ass_karaoke.cpp b/aegisub/src/ass_karaoke.cpp
index fd5084905..00300d417 100644
--- a/aegisub/src/ass_karaoke.cpp
+++ b/aegisub/src/ass_karaoke.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_karaoke.cpp
 /// @brief Parse and manipulate ASSA karaoke tags
diff --git a/aegisub/src/ass_karaoke.h b/aegisub/src/ass_karaoke.h
index a59b860de..4e90450ef 100644
--- a/aegisub/src/ass_karaoke.h
+++ b/aegisub/src/ass_karaoke.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_karaoke.h
 /// @see ass_karaoke.cpp
diff --git a/aegisub/src/ass_override.cpp b/aegisub/src/ass_override.cpp
index 016160af4..a30e65a5c 100644
--- a/aegisub/src/ass_override.cpp
+++ b/aegisub/src/ass_override.cpp
@@ -27,8 +27,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_override.cpp
 /// @brief Parse and modify ASSA style overrides
diff --git a/aegisub/src/ass_override.h b/aegisub/src/ass_override.h
index 5f23bf7c2..2818cb978 100644
--- a/aegisub/src/ass_override.h
+++ b/aegisub/src/ass_override.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_override.h
 /// @see ass_override.cpp
diff --git a/aegisub/src/ass_style.cpp b/aegisub/src/ass_style.cpp
index 4c8902cb8..6ec3f873a 100644
--- a/aegisub/src/ass_style.cpp
+++ b/aegisub/src/ass_style.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_style.cpp
 /// @brief Class for style definitions in subtitles
diff --git a/aegisub/src/ass_style.h b/aegisub/src/ass_style.h
index 8f1de7d78..430896385 100644
--- a/aegisub/src/ass_style.h
+++ b/aegisub/src/ass_style.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_style.h
 /// @see ass_style.cpp
diff --git a/aegisub/src/ass_style_storage.cpp b/aegisub/src/ass_style_storage.cpp
index b2225fd3a..fe5d15e65 100644
--- a/aegisub/src/ass_style_storage.cpp
+++ b/aegisub/src/ass_style_storage.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_style_storage.cpp
 /// @brief Manage stores of styles
diff --git a/aegisub/src/ass_style_storage.h b/aegisub/src/ass_style_storage.h
index 59fa0f7bc..a494dd1ee 100644
--- a/aegisub/src/ass_style_storage.h
+++ b/aegisub/src/ass_style_storage.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_style_storage.h
 /// @see ass_style_storage.cpp
diff --git a/aegisub/src/ass_time.cpp b/aegisub/src/ass_time.cpp
index e9b98e6be..2149630ee 100644
--- a/aegisub/src/ass_time.cpp
+++ b/aegisub/src/ass_time.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_time.cpp
 /// @brief Class for managing timestamps in subtitles
diff --git a/aegisub/src/ass_time.h b/aegisub/src/ass_time.h
index 688f9364f..972425285 100644
--- a/aegisub/src/ass_time.h
+++ b/aegisub/src/ass_time.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ass_time.h
 /// @see ass_time.cpp
diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index 99057ef68..c823db567 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_box.cpp
 /// @brief The entire audio area in the main UI, containing display and related toolbars
diff --git a/aegisub/src/audio_box.h b/aegisub/src/audio_box.h
index 669a6e746..341beceb9 100644
--- a/aegisub/src/audio_box.h
+++ b/aegisub/src/audio_box.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_box.h
 /// @see audio_box.cpp
diff --git a/aegisub/src/audio_colorscheme.cpp b/aegisub/src/audio_colorscheme.cpp
index a413e4a84..5c3f2227d 100644
--- a/aegisub/src/audio_colorscheme.cpp
+++ b/aegisub/src/audio_colorscheme.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_colorscheme.cpp
 /// @ingroup audio_ui
diff --git a/aegisub/src/audio_colorscheme.h b/aegisub/src/audio_colorscheme.h
index 7dd9fd734..b5339ce1b 100644
--- a/aegisub/src/audio_colorscheme.h
+++ b/aegisub/src/audio_colorscheme.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_colorscheme.h
 /// @see audio_colorscheme.cpp
diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp
index 3ca5ffc6c..7180c9a04 100644
--- a/aegisub/src/audio_controller.cpp
+++ b/aegisub/src/audio_controller.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_controller.cpp
 /// @brief Manage open audio and abstract state away from display
diff --git a/aegisub/src/audio_controller.h b/aegisub/src/audio_controller.h
index 6f6d02789..237ae3469 100644
--- a/aegisub/src/audio_controller.h
+++ b/aegisub/src/audio_controller.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_controller.h
 /// @see audio_controller.cpp
diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index 567ae44ba..a0377ac01 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -27,8 +27,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_display.cpp
 /// @brief Display audio in the main UI
diff --git a/aegisub/src/audio_display.h b/aegisub/src/audio_display.h
index 3ec17a934..4bc6d30a3 100644
--- a/aegisub/src/audio_display.h
+++ b/aegisub/src/audio_display.h
@@ -27,8 +27,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_display.h
 /// @see audio_display.cpp
diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp
index 54c55dc55..325449a66 100644
--- a/aegisub/src/audio_karaoke.cpp
+++ b/aegisub/src/audio_karaoke.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_karaoke.cpp
 /// @brief Karaoke table UI in audio box (not in audio display)
diff --git a/aegisub/src/audio_karaoke.h b/aegisub/src/audio_karaoke.h
index 486ae2e3f..12859c829 100644
--- a/aegisub/src/audio_karaoke.h
+++ b/aegisub/src/audio_karaoke.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_karaoke.h
 /// @see audio_karaoke.cpp
diff --git a/aegisub/src/audio_marker.cpp b/aegisub/src/audio_marker.cpp
index c00116053..9f92301d6 100644
--- a/aegisub/src/audio_marker.cpp
+++ b/aegisub/src/audio_marker.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_marker.cpp
 /// @see audio_marker.h
diff --git a/aegisub/src/audio_marker.h b/aegisub/src/audio_marker.h
index 1e512e932..c21b7ae5a 100644
--- a/aegisub/src/audio_marker.h
+++ b/aegisub/src/audio_marker.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_marker.h
 /// @see audio_marker.cpp
diff --git a/aegisub/src/audio_player.cpp b/aegisub/src/audio_player.cpp
index a33fa9015..adc6b0cc4 100644
--- a/aegisub/src/audio_player.cpp
+++ b/aegisub/src/audio_player.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player.cpp
 /// @brief Baseclass for audio players
diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp
index e08af182d..df4e139d2 100644
--- a/aegisub/src/audio_player_alsa.cpp
+++ b/aegisub/src/audio_player_alsa.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_alsa.cpp
 /// @brief ALSA-based audio output
diff --git a/aegisub/src/audio_player_alsa.h b/aegisub/src/audio_player_alsa.h
index 48fa445e3..bff1457c9 100644
--- a/aegisub/src/audio_player_alsa.h
+++ b/aegisub/src/audio_player_alsa.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_alsa.h
 /// @see audio_player_alsa.cpp
diff --git a/aegisub/src/audio_player_dsound.cpp b/aegisub/src/audio_player_dsound.cpp
index fff18a026..454b1f8cd 100644
--- a/aegisub/src/audio_player_dsound.cpp
+++ b/aegisub/src/audio_player_dsound.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_dsound.cpp
 /// @brief Old DirectSound-based audio output
diff --git a/aegisub/src/audio_player_dsound.h b/aegisub/src/audio_player_dsound.h
index 2fd3dcb0a..69d073170 100644
--- a/aegisub/src/audio_player_dsound.h
+++ b/aegisub/src/audio_player_dsound.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_dsound.h
 /// @see audio_player_dsound.cpp
diff --git a/aegisub/src/audio_player_dsound2.cpp b/aegisub/src/audio_player_dsound2.cpp
index e4e47c20c..9a7b292e5 100644
--- a/aegisub/src/audio_player_dsound2.cpp
+++ b/aegisub/src/audio_player_dsound2.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_dsound2.cpp
 /// @brief New DirectSound-based audio output
diff --git a/aegisub/src/audio_player_dsound2.h b/aegisub/src/audio_player_dsound2.h
index 8dcb02e40..2d6abfd94 100644
--- a/aegisub/src/audio_player_dsound2.h
+++ b/aegisub/src/audio_player_dsound2.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_dsound2.h
 /// @see audio_player_dsound2.cpp
diff --git a/aegisub/src/audio_player_openal.cpp b/aegisub/src/audio_player_openal.cpp
index b3089c12f..3b6e6e92c 100644
--- a/aegisub/src/audio_player_openal.cpp
+++ b/aegisub/src/audio_player_openal.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_openal.cpp
 /// @brief OpenAL-based audio output
diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h
index 3f306481c..df8f09358 100644
--- a/aegisub/src/audio_player_openal.h
+++ b/aegisub/src/audio_player_openal.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_openal.h
 /// @see audio_player_openal.cpp
diff --git a/aegisub/src/audio_player_oss.cpp b/aegisub/src/audio_player_oss.cpp
index 63fbb65ba..a314d4f09 100644
--- a/aegisub/src/audio_player_oss.cpp
+++ b/aegisub/src/audio_player_oss.cpp
@@ -24,8 +24,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_oss.cpp
 /// @brief Open Sound System audio output
diff --git a/aegisub/src/audio_player_oss.h b/aegisub/src/audio_player_oss.h
index afa0296d9..42cfe0e66 100644
--- a/aegisub/src/audio_player_oss.h
+++ b/aegisub/src/audio_player_oss.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_oss.h
 /// @see audio_player_oss.cpp
diff --git a/aegisub/src/audio_player_portaudio.cpp b/aegisub/src/audio_player_portaudio.cpp
index d81d6ecfd..edd1c6717 100644
--- a/aegisub/src/audio_player_portaudio.cpp
+++ b/aegisub/src/audio_player_portaudio.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id: audio_player_portaudio.cpp 5897 2011-11-20 03:43:52Z plorkyeran $
 
 /// @file audio_player_portaudio.cpp
 /// @brief PortAudio v18-based audio output
diff --git a/aegisub/src/audio_player_portaudio.h b/aegisub/src/audio_player_portaudio.h
index dcb64afc5..4f75c35cd 100644
--- a/aegisub/src/audio_player_portaudio.h
+++ b/aegisub/src/audio_player_portaudio.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id: audio_player_portaudio.h 4719 2010-08-02 08:03:58Z plorkyeran $
 
 /// @file audio_player_portaudio.h
 /// @see audio_player_portaudio.cpp
diff --git a/aegisub/src/audio_player_pulse.cpp b/aegisub/src/audio_player_pulse.cpp
index cbfe9e6fd..9b8494bbb 100644
--- a/aegisub/src/audio_player_pulse.cpp
+++ b/aegisub/src/audio_player_pulse.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_pulse.cpp
 /// @brief PulseAudio-based audio output
diff --git a/aegisub/src/audio_player_pulse.h b/aegisub/src/audio_player_pulse.h
index 4d1bad04d..9ce93c0e3 100644
--- a/aegisub/src/audio_player_pulse.h
+++ b/aegisub/src/audio_player_pulse.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player_pulse.h
 /// @see audio_player_pulse.cpp
diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp
index 1482a56d6..e5b8eb6fe 100644
--- a/aegisub/src/audio_provider.cpp
+++ b/aegisub/src/audio_provider.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider.cpp
 /// @brief Baseclass for audio providers
diff --git a/aegisub/src/audio_provider_avs.cpp b/aegisub/src/audio_provider_avs.cpp
index 51531137d..4674d587a 100644
--- a/aegisub/src/audio_provider_avs.cpp
+++ b/aegisub/src/audio_provider_avs.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_avs.cpp
 /// @brief Avisynth-based audio provider
diff --git a/aegisub/src/audio_provider_avs.h b/aegisub/src/audio_provider_avs.h
index d2ebd7a3b..bd8906b71 100644
--- a/aegisub/src/audio_provider_avs.h
+++ b/aegisub/src/audio_provider_avs.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_avs.h
 /// @see audio_provider_avs.cpp
diff --git a/aegisub/src/audio_provider_convert.cpp b/aegisub/src/audio_provider_convert.cpp
index bddca3350..4c945c2fa 100644
--- a/aegisub/src/audio_provider_convert.cpp
+++ b/aegisub/src/audio_provider_convert.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_convert.cpp
 /// @brief Intermediate sample format-converting audio provider
diff --git a/aegisub/src/audio_provider_convert.h b/aegisub/src/audio_provider_convert.h
index b458a5e11..6ae666d45 100644
--- a/aegisub/src/audio_provider_convert.h
+++ b/aegisub/src/audio_provider_convert.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_convert.h
 /// @see audio_provider_convert.cpp
diff --git a/aegisub/src/audio_provider_dummy.cpp b/aegisub/src/audio_provider_dummy.cpp
index de9a0241b..229b6b4e5 100644
--- a/aegisub/src/audio_provider_dummy.cpp
+++ b/aegisub/src/audio_provider_dummy.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_dummy.cpp
 /// @brief Dummy (silence or noise) audio provider
diff --git a/aegisub/src/audio_provider_dummy.h b/aegisub/src/audio_provider_dummy.h
index 8e5b62dc8..b1a57ffd6 100644
--- a/aegisub/src/audio_provider_dummy.h
+++ b/aegisub/src/audio_provider_dummy.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_dummy.h
 /// @see audio_provider_dummy.cpp
diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/aegisub/src/audio_provider_ffmpegsource.cpp
index 48e425409..bbf9ae92b 100644
--- a/aegisub/src/audio_provider_ffmpegsource.cpp
+++ b/aegisub/src/audio_provider_ffmpegsource.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_ffmpegsource.cpp
 /// @brief ffms2-based audio provider
diff --git a/aegisub/src/audio_provider_ffmpegsource.h b/aegisub/src/audio_provider_ffmpegsource.h
index 0c85dc558..73fef6b34 100644
--- a/aegisub/src/audio_provider_ffmpegsource.h
+++ b/aegisub/src/audio_provider_ffmpegsource.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_ffmpegsource.h
 /// @see audio_provider_ffmpegsource.cpp
diff --git a/aegisub/src/audio_provider_hd.cpp b/aegisub/src/audio_provider_hd.cpp
index 072b6ab02..9b0279ea8 100644
--- a/aegisub/src/audio_provider_hd.cpp
+++ b/aegisub/src/audio_provider_hd.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_hd.cpp
 /// @brief Caching audio provider using a file for backing
diff --git a/aegisub/src/audio_provider_hd.h b/aegisub/src/audio_provider_hd.h
index 1ada9a80a..0b96c9073 100644
--- a/aegisub/src/audio_provider_hd.h
+++ b/aegisub/src/audio_provider_hd.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_hd.h
 /// @see audio_provider_hd.cpp
diff --git a/aegisub/src/audio_provider_lock.cpp b/aegisub/src/audio_provider_lock.cpp
index b44cabf5b..12e948d13 100644
--- a/aegisub/src/audio_provider_lock.cpp
+++ b/aegisub/src/audio_provider_lock.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file audio_provider_lock.cpp
 /// @brief An audio provider adapter for un-threadsafe audio providers
diff --git a/aegisub/src/audio_provider_lock.h b/aegisub/src/audio_provider_lock.h
index 98b82b6c9..d879e7a5a 100644
--- a/aegisub/src/audio_provider_lock.h
+++ b/aegisub/src/audio_provider_lock.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file audio_provider_lock.h
 /// @brief An audio provider adapter for un-threadsafe audio providers
diff --git a/aegisub/src/audio_provider_pcm.cpp b/aegisub/src/audio_provider_pcm.cpp
index d9c141d10..52e1577da 100644
--- a/aegisub/src/audio_provider_pcm.cpp
+++ b/aegisub/src/audio_provider_pcm.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_pcm.cpp
 /// @brief PCM WAV and WAV64 audio provider
diff --git a/aegisub/src/audio_provider_pcm.h b/aegisub/src/audio_provider_pcm.h
index 3d3def4de..0db367ea5 100644
--- a/aegisub/src/audio_provider_pcm.h
+++ b/aegisub/src/audio_provider_pcm.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_pcm.h
 /// @see audio_provider_pcm.cpp
diff --git a/aegisub/src/audio_provider_ram.cpp b/aegisub/src/audio_provider_ram.cpp
index f6e575f94..810ac593f 100644
--- a/aegisub/src/audio_provider_ram.cpp
+++ b/aegisub/src/audio_provider_ram.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_ram.cpp
 /// @brief Caching audio provider using heap memory for backing
diff --git a/aegisub/src/audio_provider_ram.h b/aegisub/src/audio_provider_ram.h
index f8bbbf026..190d9f4e7 100644
--- a/aegisub/src/audio_provider_ram.h
+++ b/aegisub/src/audio_provider_ram.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider_ram.h
 /// @see audio_provider_ram.cpp
diff --git a/aegisub/src/audio_renderer.cpp b/aegisub/src/audio_renderer.cpp
index 710394b2c..dbe9f6efe 100644
--- a/aegisub/src/audio_renderer.cpp
+++ b/aegisub/src/audio_renderer.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_renderer.cpp
 /// @brief Base classes for audio renderers (spectrum, waveform, ...)
diff --git a/aegisub/src/audio_renderer.h b/aegisub/src/audio_renderer.h
index dec7a8d86..d5c054e5e 100644
--- a/aegisub/src/audio_renderer.h
+++ b/aegisub/src/audio_renderer.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_renderer.h
 /// @see audio_renderer.cpp
diff --git a/aegisub/src/audio_renderer_spectrum.cpp b/aegisub/src/audio_renderer_spectrum.cpp
index d14f17d44..bafc12b9a 100644
--- a/aegisub/src/audio_renderer_spectrum.cpp
+++ b/aegisub/src/audio_renderer_spectrum.cpp
@@ -27,8 +27,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_renderer_spectrum.cpp
 /// @brief Caching frequency-power spectrum renderer for audio display
diff --git a/aegisub/src/audio_renderer_spectrum.h b/aegisub/src/audio_renderer_spectrum.h
index 55e14f7bb..93df7aeb4 100644
--- a/aegisub/src/audio_renderer_spectrum.h
+++ b/aegisub/src/audio_renderer_spectrum.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_renderer_spectrum.h
 /// @see audio_renderer_spectrum.cpp
diff --git a/aegisub/src/audio_renderer_waveform.cpp b/aegisub/src/audio_renderer_waveform.cpp
index db575e3c5..edf73674a 100644
--- a/aegisub/src/audio_renderer_waveform.cpp
+++ b/aegisub/src/audio_renderer_waveform.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_renderer_waveform.cpp
 /// @ingroup audio_ui
diff --git a/aegisub/src/audio_renderer_waveform.h b/aegisub/src/audio_renderer_waveform.h
index ed930d4f8..4e3f62d06 100644
--- a/aegisub/src/audio_renderer_waveform.h
+++ b/aegisub/src/audio_renderer_waveform.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_renderer_waveform.h
 /// @see audio_renderer_waveform.cpp
diff --git a/aegisub/src/audio_rendering_style.h b/aegisub/src/audio_rendering_style.h
index 3e0875fb4..312d98f24 100644
--- a/aegisub/src/audio_rendering_style.h
+++ b/aegisub/src/audio_rendering_style.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @brief Styles audio may be rendered in
 ///
diff --git a/aegisub/src/audio_timing.h b/aegisub/src/audio_timing.h
index d2312c6b4..17b8eea8a 100644
--- a/aegisub/src/audio_timing.h
+++ b/aegisub/src/audio_timing.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_timing.h
 /// @brief Construction-functions for timing controller objects
diff --git a/aegisub/src/audio_timing_dialogue.cpp b/aegisub/src/audio_timing_dialogue.cpp
index 44feff0ec..7e37d0255 100644
--- a/aegisub/src/audio_timing_dialogue.cpp
+++ b/aegisub/src/audio_timing_dialogue.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_timing_dialogue.cpp
 /// @brief Default timing mode for dialogue subtitles
diff --git a/aegisub/src/audio_timing_karaoke.cpp b/aegisub/src/audio_timing_karaoke.cpp
index 7ab4f0566..12ceb031d 100644
--- a/aegisub/src/audio_timing_karaoke.cpp
+++ b/aegisub/src/audio_timing_karaoke.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_timing_karaoke.cpp
 /// @brief Timing mode for karaoke
diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp
index b563b0bf8..97a041cfc 100644
--- a/aegisub/src/auto4_base.cpp
+++ b/aegisub/src/auto4_base.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_base.cpp
 /// @brief Baseclasses for Automation 4 scripting framework
diff --git a/aegisub/src/auto4_base.h b/aegisub/src/auto4_base.h
index 4cd0651d3..8d60e4747 100644
--- a/aegisub/src/auto4_base.h
+++ b/aegisub/src/auto4_base.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_base.h
 /// @see auto4_base.cpp
diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp
index 896abbafc..4d111aa44 100644
--- a/aegisub/src/auto4_lua.cpp
+++ b/aegisub/src/auto4_lua.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_lua.cpp
 /// @brief Lua 5.1-based scripting engine
diff --git a/aegisub/src/auto4_lua.h b/aegisub/src/auto4_lua.h
index 98b7e5434..6fc7e6b74 100644
--- a/aegisub/src/auto4_lua.h
+++ b/aegisub/src/auto4_lua.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_lua.h
 /// @see auto4_lua.cpp
diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp
index 3d1d582d6..cbf34bb2a 100644
--- a/aegisub/src/auto4_lua_assfile.cpp
+++ b/aegisub/src/auto4_lua_assfile.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_lua_assfile.cpp
 /// @brief Lua 5.1-based scripting engine (interface to subtitle files)
diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp
index 08b2bf9dd..292f93f77 100644
--- a/aegisub/src/auto4_lua_dialog.cpp
+++ b/aegisub/src/auto4_lua_dialog.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_lua_dialog.cpp
 /// @brief Lua 5.1-based scripting engine (configuration-dialogue interface)
diff --git a/aegisub/src/auto4_lua_factory.h b/aegisub/src/auto4_lua_factory.h
index 43dfc89f7..6f0848ef1 100644
--- a/aegisub/src/auto4_lua_factory.h
+++ b/aegisub/src/auto4_lua_factory.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_lua_factory.h
 /// @brief Factory-class for Lua 5.1-based scripting engine
diff --git a/aegisub/src/auto4_lua_progresssink.cpp b/aegisub/src/auto4_lua_progresssink.cpp
index cf85ed980..9f5923755 100644
--- a/aegisub/src/auto4_lua_progresssink.cpp
+++ b/aegisub/src/auto4_lua_progresssink.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file auto4_lua_progresssink.cpp
 /// @brief Lua 5.1-based scripting engine
diff --git a/aegisub/src/auto4_lua_scriptreader.cpp b/aegisub/src/auto4_lua_scriptreader.cpp
index e7fcf0b38..ec3bfa9f6 100644
--- a/aegisub/src/auto4_lua_scriptreader.cpp
+++ b/aegisub/src/auto4_lua_scriptreader.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file auto4_lua_scriptreader.cpp
 /// @brief Script-file reader for Lua 5.1-based scripting engine
diff --git a/aegisub/src/auto4_lua_scriptreader.h b/aegisub/src/auto4_lua_scriptreader.h
index 2d12bf65e..932ccb35d 100644
--- a/aegisub/src/auto4_lua_scriptreader.h
+++ b/aegisub/src/auto4_lua_scriptreader.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file auto4_lua_scriptreader.h
 /// @see auto4_lua_scriptreader.cpp
diff --git a/aegisub/src/avisynth_wrap.cpp b/aegisub/src/avisynth_wrap.cpp
index e12070095..f4b8a3092 100644
--- a/aegisub/src/avisynth_wrap.cpp
+++ b/aegisub/src/avisynth_wrap.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file avisynth_wrap.cpp
 /// @brief Wrapper-layer for Avisynth
diff --git a/aegisub/src/avisynth_wrap.h b/aegisub/src/avisynth_wrap.h
index ff3d6ce2d..48d1e2a7b 100644
--- a/aegisub/src/avisynth_wrap.h
+++ b/aegisub/src/avisynth_wrap.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file avisynth_wrap.h
 /// @see avisynth_wrap.cpp
diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index b73990347..6a942c6ed 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file base_grid.cpp
 /// @brief Base for subtitle grid in main UI
diff --git a/aegisub/src/base_grid.h b/aegisub/src/base_grid.h
index 6e8c4bdca..d6d1d6ce3 100644
--- a/aegisub/src/base_grid.h
+++ b/aegisub/src/base_grid.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file base_grid.h
 /// @see base_grid.cpp
diff --git a/aegisub/src/block_cache.h b/aegisub/src/block_cache.h
index 222ea68cf..52e7c0263 100644
--- a/aegisub/src/block_cache.h
+++ b/aegisub/src/block_cache.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file block_cache.h
 /// @ingroup utility
diff --git a/aegisub/src/charset_conv.cpp b/aegisub/src/charset_conv.cpp
index 839eb5e20..65b5f5a28 100644
--- a/aegisub/src/charset_conv.cpp
+++ b/aegisub/src/charset_conv.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file charset_conv.cpp
 /// @brief Iconv-based implementation of character set conversions
diff --git a/aegisub/src/charset_conv.h b/aegisub/src/charset_conv.h
index 6ef22a164..d31229130 100644
--- a/aegisub/src/charset_conv.h
+++ b/aegisub/src/charset_conv.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file charset_conv.h
 /// @see charset_conv.cpp
diff --git a/aegisub/src/charset_detect.cpp b/aegisub/src/charset_detect.cpp
index 8c3284e45..24c85df4f 100644
--- a/aegisub/src/charset_detect.cpp
+++ b/aegisub/src/charset_detect.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file charset_detect.cpp
 /// @brief Wrapper around text encoding detection library
diff --git a/aegisub/src/charset_detect.h b/aegisub/src/charset_detect.h
index a3d1c384a..0307245ae 100644
--- a/aegisub/src/charset_detect.h
+++ b/aegisub/src/charset_detect.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file charset_detect.h
 /// @see charset_detect.cpp
diff --git a/aegisub/src/colorspace.cpp b/aegisub/src/colorspace.cpp
index 4beda78a0..408c1a987 100644
--- a/aegisub/src/colorspace.cpp
+++ b/aegisub/src/colorspace.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file colorspace.cpp
 /// @brief Functions for converting colours between different representations
diff --git a/aegisub/src/colorspace.h b/aegisub/src/colorspace.h
index a06e919ea..1fb87a4c4 100644
--- a/aegisub/src/colorspace.h
+++ b/aegisub/src/colorspace.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file colorspace.h
 /// @see colorspace.cpp
diff --git a/aegisub/src/colour_button.cpp b/aegisub/src/colour_button.cpp
index f2c0e18dc..e9d0f3583 100644
--- a/aegisub/src/colour_button.cpp
+++ b/aegisub/src/colour_button.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file colour_button.cpp
 /// @brief Push-button that displays a colour for label, and brings up colour selection dialogue when pressed
diff --git a/aegisub/src/colour_button.h b/aegisub/src/colour_button.h
index f402ed114..73584e892 100644
--- a/aegisub/src/colour_button.h
+++ b/aegisub/src/colour_button.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file colour_button.h
 /// @see colour_button.cpp
diff --git a/aegisub/src/command/app.cpp b/aegisub/src/command/app.cpp
index 0236f852a..51de63999 100644
--- a/aegisub/src/command/app.cpp
+++ b/aegisub/src/command/app.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file app.cpp
 /// @brief app/ commands.
diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp
index 6d8bee177..507d96be5 100644
--- a/aegisub/src/command/audio.cpp
+++ b/aegisub/src/command/audio.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio.cpp
 /// @brief audio/ commands.
diff --git a/aegisub/src/command/automation.cpp b/aegisub/src/command/automation.cpp
index 1e8eba4e5..4bda9b8c3 100644
--- a/aegisub/src/command/automation.cpp
+++ b/aegisub/src/command/automation.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file automation.cpp
 /// @brief am/ (automation) commands
diff --git a/aegisub/src/command/command.cpp b/aegisub/src/command/command.cpp
index 6dbc8b05e..19c52dae0 100644
--- a/aegisub/src/command/command.cpp
+++ b/aegisub/src/command/command.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file command.cpp
 /// @brief Command system base file.
diff --git a/aegisub/src/command/command.h b/aegisub/src/command/command.h
index d3966b240..1f0046d2e 100644
--- a/aegisub/src/command/command.h
+++ b/aegisub/src/command/command.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file command.h
 /// @brief Command base class and main header.
diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index e23f6ae15..29016246a 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file edit.cpp
 /// @brief edit/ commands.
diff --git a/aegisub/src/command/grid.cpp b/aegisub/src/command/grid.cpp
index 8a96b1f7a..f77bb377a 100644
--- a/aegisub/src/command/grid.cpp
+++ b/aegisub/src/command/grid.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file grid.cpp
 /// @brief grid/ commands.
diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp
index 6f6c88b2c..e62c97d9c 100644
--- a/aegisub/src/command/help.cpp
+++ b/aegisub/src/command/help.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file help.cpp
 /// @brief help/ commands
diff --git a/aegisub/src/command/icon.cpp b/aegisub/src/command/icon.cpp
index 1ceb74d4e..5cc1dbc70 100644
--- a/aegisub/src/command/icon.cpp
+++ b/aegisub/src/command/icon.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file icon.h
 /// @brief Icon for commands.
diff --git a/aegisub/src/command/icon.h b/aegisub/src/command/icon.h
index 327636f38..b9ea97abb 100644
--- a/aegisub/src/command/icon.h
+++ b/aegisub/src/command/icon.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file icon.h
 /// @brief Icon for commands.
diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp
index e8864e1f6..a8e7c7717 100644
--- a/aegisub/src/command/keyframe.cpp
+++ b/aegisub/src/command/keyframe.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file keyframe.cpp
 /// @brief keyframe/ commands.
diff --git a/aegisub/src/command/recent.cpp b/aegisub/src/command/recent.cpp
index ceb1390a6..57fec5893 100644
--- a/aegisub/src/command/recent.cpp
+++ b/aegisub/src/command/recent.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file recent.cpp
 /// @brief recent/ commands, rebuild MRU-based lists.
diff --git a/aegisub/src/command/subtitle.cpp b/aegisub/src/command/subtitle.cpp
index 98ef0d286..253660532 100644
--- a/aegisub/src/command/subtitle.cpp
+++ b/aegisub/src/command/subtitle.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle.cpp
 /// @brief subtitle/ commands.
diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp
index 1ee397385..d18be7d14 100644
--- a/aegisub/src/command/time.cpp
+++ b/aegisub/src/command/time.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file time.cpp
 /// @brief time/ commands.
diff --git a/aegisub/src/command/timecode.cpp b/aegisub/src/command/timecode.cpp
index 6cdef2140..5a39ae674 100644
--- a/aegisub/src/command/timecode.cpp
+++ b/aegisub/src/command/timecode.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file timecode.cpp
 /// @brief timecode/ commands.
diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp
index 5665b254f..44f714008 100644
--- a/aegisub/src/command/tool.cpp
+++ b/aegisub/src/command/tool.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file tool.cpp
 /// @brief tool/ commands.
diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index fd34d8ef1..84eeec4b3 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -28,8 +28,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video.cpp
 /// @brief video/ commands.
diff --git a/aegisub/src/command/vis_tool.cpp b/aegisub/src/command/vis_tool.cpp
index 4d0e9f66d..64cb8dc9a 100644
--- a/aegisub/src/command/vis_tool.cpp
+++ b/aegisub/src/command/vis_tool.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file vis_tool.cpp
 /// @brief Visual typesetting tools commands
diff --git a/aegisub/src/config/config_windows0.h b/aegisub/src/config/config_windows0.h
index 7ffdbf3d9..693a94ed9 100644
--- a/aegisub/src/config/config_windows0.h
+++ b/aegisub/src/config/config_windows0.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file config/config_windows0.h
 /// @brief Base configuration for Windows builds, to be copied to config_windows.h and edited by the developer
diff --git a/aegisub/src/dialog_about.cpp b/aegisub/src/dialog_about.cpp
index 65c839840..c897c0b45 100644
--- a/aegisub/src/dialog_about.cpp
+++ b/aegisub/src/dialog_about.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_about.cpp
 /// @brief About-dialogue box
diff --git a/aegisub/src/dialog_about.h b/aegisub/src/dialog_about.h
index 9a1bfdee2..183c6593c 100644
--- a/aegisub/src/dialog_about.h
+++ b/aegisub/src/dialog_about.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_about.h
 /// @see dialog_about.cpp
diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp
index 444685d8d..237198410 100644
--- a/aegisub/src/dialog_attachments.cpp
+++ b/aegisub/src/dialog_attachments.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_attachments.cpp
 /// @brief Manage files attached to the subtitle file
diff --git a/aegisub/src/dialog_attachments.h b/aegisub/src/dialog_attachments.h
index 99ef3792d..ac44d4058 100644
--- a/aegisub/src/dialog_attachments.h
+++ b/aegisub/src/dialog_attachments.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_attachments.h
 /// @see dialog_attachments.cpp
diff --git a/aegisub/src/dialog_automation.cpp b/aegisub/src/dialog_automation.cpp
index b12b9c8ed..f93d00106 100644
--- a/aegisub/src/dialog_automation.cpp
+++ b/aegisub/src/dialog_automation.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_automation.cpp
 /// @brief Manage loaded Automation scripts
diff --git a/aegisub/src/dialog_automation.h b/aegisub/src/dialog_automation.h
index 607045aa7..e14487e9b 100644
--- a/aegisub/src/dialog_automation.h
+++ b/aegisub/src/dialog_automation.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_automation.h
 /// @see dialog_automation.cpp
diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index 91cf250f5..95eb6b1e0 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_colorpicker.cpp
 /// @brief Custom colour-selection dialogue box
diff --git a/aegisub/src/dialog_colorpicker.h b/aegisub/src/dialog_colorpicker.h
index d0060821b..c6af177f2 100644
--- a/aegisub/src/dialog_colorpicker.h
+++ b/aegisub/src/dialog_colorpicker.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_colorpicker.h
 /// @see dialog_colorpicker.cpp
diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp
index 0572b730e..aa389c479 100644
--- a/aegisub/src/dialog_detached_video.cpp
+++ b/aegisub/src/dialog_detached_video.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_detached_video.cpp
 /// @brief Detached video window
diff --git a/aegisub/src/dialog_detached_video.h b/aegisub/src/dialog_detached_video.h
index 52ce3709f..bda612458 100644
--- a/aegisub/src/dialog_detached_video.h
+++ b/aegisub/src/dialog_detached_video.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_detached_video.h
 /// @see dialog_detached_video.cpp
diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp
index 432206dc9..827f5f527 100644
--- a/aegisub/src/dialog_dummy_video.cpp
+++ b/aegisub/src/dialog_dummy_video.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_dummy_video.cpp
 /// @brief Set up dummy video provider
diff --git a/aegisub/src/dialog_dummy_video.h b/aegisub/src/dialog_dummy_video.h
index ab86d652e..07e9a22d3 100644
--- a/aegisub/src/dialog_dummy_video.h
+++ b/aegisub/src/dialog_dummy_video.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_dummy_video.h
 /// @see dialog_dummy_video.cpp
diff --git a/aegisub/src/dialog_export.cpp b/aegisub/src/dialog_export.cpp
index 4a78239f2..79644f2cb 100644
--- a/aegisub/src/dialog_export.cpp
+++ b/aegisub/src/dialog_export.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_export.cpp
 /// @brief Export set-up dialogue box
diff --git a/aegisub/src/dialog_export.h b/aegisub/src/dialog_export.h
index 1b1c4f39a..8b5f5f7f9 100644
--- a/aegisub/src/dialog_export.h
+++ b/aegisub/src/dialog_export.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_export.h
 /// @see dialog_export.cpp
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index 5437b8d14..95b24cc91 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_fonts_collector.cpp
 /// @brief Font collector dialogue box
diff --git a/aegisub/src/dialog_fonts_collector.h b/aegisub/src/dialog_fonts_collector.h
index 83b70a3da..5b3e351d1 100644
--- a/aegisub/src/dialog_fonts_collector.h
+++ b/aegisub/src/dialog_fonts_collector.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_fonts_collector.h
 /// @see dialog_fonts_collector.cpp
diff --git a/aegisub/src/dialog_jumpto.cpp b/aegisub/src/dialog_jumpto.cpp
index 635eedef7..4208f603a 100644
--- a/aegisub/src/dialog_jumpto.cpp
+++ b/aegisub/src/dialog_jumpto.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_jumpto.cpp
 /// @brief Dialogue box to enter a time to seek video to
diff --git a/aegisub/src/dialog_jumpto.h b/aegisub/src/dialog_jumpto.h
index f380235cf..d7537a543 100644
--- a/aegisub/src/dialog_jumpto.h
+++ b/aegisub/src/dialog_jumpto.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_jumpto.h
 /// @see dialog_jumpto.cpp
diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp
index a256d3abe..e50f6fcb9 100644
--- a/aegisub/src/dialog_kara_timing_copy.cpp
+++ b/aegisub/src/dialog_kara_timing_copy.cpp
@@ -27,8 +27,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_kara_timing_copy.cpp
 /// @brief Karaoke timing copier dialogue box and logic
diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h
index 49008f441..ecbbf6c41 100644
--- a/aegisub/src/dialog_kara_timing_copy.h
+++ b/aegisub/src/dialog_kara_timing_copy.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_kara_timing_copy.h
 /// @see dialog_kara_timing_copy.cpp
diff --git a/aegisub/src/dialog_log.cpp b/aegisub/src/dialog_log.cpp
index 6cfb2f0a1..826b1caf6 100644
--- a/aegisub/src/dialog_log.cpp
+++ b/aegisub/src/dialog_log.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_log.cpp
 /// @brief Log window.
diff --git a/aegisub/src/dialog_log.h b/aegisub/src/dialog_log.h
index 6055fd277..a4a5ea8e9 100644
--- a/aegisub/src/dialog_log.h
+++ b/aegisub/src/dialog_log.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_log.h
 /// @see dialog_log.cpp
diff --git a/aegisub/src/dialog_manager.h b/aegisub/src/dialog_manager.h
index f8b873ec8..e85b6e608 100644
--- a/aegisub/src/dialog_manager.h
+++ b/aegisub/src/dialog_manager.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file dialog_manager.h
 /// @brief Manager for dialogs
diff --git a/aegisub/src/dialog_paste_over.cpp b/aegisub/src/dialog_paste_over.cpp
index 110112a26..d40254567 100644
--- a/aegisub/src/dialog_paste_over.cpp
+++ b/aegisub/src/dialog_paste_over.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_paste_over.cpp
 /// @brief Paste Over set-up dialogue box
diff --git a/aegisub/src/dialog_paste_over.h b/aegisub/src/dialog_paste_over.h
index c51b8061b..af65a373b 100644
--- a/aegisub/src/dialog_paste_over.h
+++ b/aegisub/src/dialog_paste_over.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_paste_over.h
 /// @see dialog_paste_over.cpp
diff --git a/aegisub/src/dialog_progress.cpp b/aegisub/src/dialog_progress.cpp
index 649e92c36..0db73855d 100644
--- a/aegisub/src/dialog_progress.cpp
+++ b/aegisub/src/dialog_progress.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file dialog_progress.cpp
 /// @brief Progress-bar dialog box for displaying during long operations
diff --git a/aegisub/src/dialog_progress.h b/aegisub/src/dialog_progress.h
index 4cf6ac4bf..a08c55793 100644
--- a/aegisub/src/dialog_progress.h
+++ b/aegisub/src/dialog_progress.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file dialog_progress.h
 /// @see dialog_progress.cpp
diff --git a/aegisub/src/dialog_properties.cpp b/aegisub/src/dialog_properties.cpp
index b6759e68a..cff7a1410 100644
--- a/aegisub/src/dialog_properties.cpp
+++ b/aegisub/src/dialog_properties.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_properties.cpp
 /// @brief Dialogue box to set subtitle meta-data
diff --git a/aegisub/src/dialog_properties.h b/aegisub/src/dialog_properties.h
index 6307bd2d3..ae64333d0 100644
--- a/aegisub/src/dialog_properties.h
+++ b/aegisub/src/dialog_properties.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_properties.h
 /// @see dialog_properties.cpp
diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp
index 4be62afd0..aa5eaf47b 100644
--- a/aegisub/src/dialog_resample.cpp
+++ b/aegisub/src/dialog_resample.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file dialog_resample.cpp
 /// @brief Resample Resolution dialogue box and logic
diff --git a/aegisub/src/dialog_resample.h b/aegisub/src/dialog_resample.h
index e4d9e94d4..4116c7c36 100644
--- a/aegisub/src/dialog_resample.h
+++ b/aegisub/src/dialog_resample.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file dialog_resample.h
 /// @see dialog_resample.cpp
diff --git a/aegisub/src/dialog_search_replace.cpp b/aegisub/src/dialog_search_replace.cpp
index 32ac451ea..5c689f53c 100644
--- a/aegisub/src/dialog_search_replace.cpp
+++ b/aegisub/src/dialog_search_replace.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_search_replace.cpp
 /// @brief Find and Search/replace dialogue box and logic
diff --git a/aegisub/src/dialog_search_replace.h b/aegisub/src/dialog_search_replace.h
index d1d993f4a..bd73cb72d 100644
--- a/aegisub/src/dialog_search_replace.h
+++ b/aegisub/src/dialog_search_replace.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_search_replace.h
 /// @see dialog_search_replace.cpp
diff --git a/aegisub/src/dialog_selected_choices.cpp b/aegisub/src/dialog_selected_choices.cpp
index c79e87a44..fa6ded4ed 100644
--- a/aegisub/src/dialog_selected_choices.cpp
+++ b/aegisub/src/dialog_selected_choices.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_selected_choices.cpp
 /// @brief wxMultiChoiceDialog with Select All and Select None
diff --git a/aegisub/src/dialog_selected_choices.h b/aegisub/src/dialog_selected_choices.h
index 8ff57945d..6d8df3930 100644
--- a/aegisub/src/dialog_selected_choices.h
+++ b/aegisub/src/dialog_selected_choices.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_selected_choices.cpp
 /// @brief wxMultiChoiceDialog with Select All and Select None
diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp
index 572747d49..b2b10a1ba 100644
--- a/aegisub/src/dialog_selection.cpp
+++ b/aegisub/src/dialog_selection.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_selection.cpp
 /// @brief Select Lines dialogue box and logic
diff --git a/aegisub/src/dialog_selection.h b/aegisub/src/dialog_selection.h
index fc9ee4a15..57ad08fcb 100644
--- a/aegisub/src/dialog_selection.h
+++ b/aegisub/src/dialog_selection.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_selection.h
 /// @see dialog_selection.cpp
diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index 40f64442c..b6f6fd6e2 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_shift_times.cpp
 /// @brief Shift Times dialogue box and logic
diff --git a/aegisub/src/dialog_shift_times.h b/aegisub/src/dialog_shift_times.h
index 3f98f639a..652c4baac 100644
--- a/aegisub/src/dialog_shift_times.h
+++ b/aegisub/src/dialog_shift_times.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_shift_times.h
 /// @see dialog_shift_times.cpp
diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp
index bcd00fa6c..1654ea753 100644
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_spellchecker.cpp
 /// @brief Spell checker dialogue box
diff --git a/aegisub/src/dialog_spellchecker.h b/aegisub/src/dialog_spellchecker.h
index 67fc3a0d3..a96bd3fbd 100644
--- a/aegisub/src/dialog_spellchecker.h
+++ b/aegisub/src/dialog_spellchecker.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_spellchecker.h
 /// @see dialog_spellchecker.cpp
diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index e1587b24b..e5264c811 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_style_editor.cpp
 /// @brief Style Editor dialogue box
diff --git a/aegisub/src/dialog_style_editor.h b/aegisub/src/dialog_style_editor.h
index 29fa8ad72..eddf88900 100644
--- a/aegisub/src/dialog_style_editor.h
+++ b/aegisub/src/dialog_style_editor.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_style_editor.h
 /// @see dialog_style_editor.cpp
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index 2b5aa39ac..b16817d6c 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_style_manager.cpp
 /// @brief Style Manager dialogue box and partial logic
diff --git a/aegisub/src/dialog_style_manager.h b/aegisub/src/dialog_style_manager.h
index 99efa36fd..1ef3ca764 100644
--- a/aegisub/src/dialog_style_manager.h
+++ b/aegisub/src/dialog_style_manager.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_style_manager.h
 /// @see dialog_style_manager.cpp
diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp
index 52a8502fc..4458a128b 100644
--- a/aegisub/src/dialog_styling_assistant.cpp
+++ b/aegisub/src/dialog_styling_assistant.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_styling_assistant.cpp
 /// @brief Styling Assistant dialogue box and logic
diff --git a/aegisub/src/dialog_styling_assistant.h b/aegisub/src/dialog_styling_assistant.h
index 4ca9a0e20..d928ece33 100644
--- a/aegisub/src/dialog_styling_assistant.h
+++ b/aegisub/src/dialog_styling_assistant.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_styling_assistant.h
 /// @see dialog_styling_assistant.cpp
diff --git a/aegisub/src/dialog_text_import.cpp b/aegisub/src/dialog_text_import.cpp
index 018ade74f..cd231ba13 100644
--- a/aegisub/src/dialog_text_import.cpp
+++ b/aegisub/src/dialog_text_import.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_text_import.cpp
 /// @brief Set-up import from plain text files
diff --git a/aegisub/src/dialog_text_import.h b/aegisub/src/dialog_text_import.h
index cddd1dc43..27bbfe6ef 100644
--- a/aegisub/src/dialog_text_import.h
+++ b/aegisub/src/dialog_text_import.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_text_import.h
 /// @see dialog_text_import.cpp
diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp
index 62d4aefc0..cbf9beb07 100644
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_timing_processor.cpp
 /// @brief Timing Post-processor dialogue box and logic
diff --git a/aegisub/src/dialog_timing_processor.h b/aegisub/src/dialog_timing_processor.h
index c8e8a5113..a4341a3a5 100644
--- a/aegisub/src/dialog_timing_processor.h
+++ b/aegisub/src/dialog_timing_processor.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_timing_processor.h
 /// @see dialog_timing_processor.cpp
diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp
index 82bea8d1b..8d2d9773c 100644
--- a/aegisub/src/dialog_translation.cpp
+++ b/aegisub/src/dialog_translation.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_translation.cpp
 /// @brief Translation Assistant dialogue box and logic
diff --git a/aegisub/src/dialog_translation.h b/aegisub/src/dialog_translation.h
index ca861d086..3155fead6 100644
--- a/aegisub/src/dialog_translation.h
+++ b/aegisub/src/dialog_translation.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_translation.h
 /// @see dialog_translation.cpp
diff --git a/aegisub/src/dialog_version_check.cpp b/aegisub/src/dialog_version_check.cpp
index 903f16ff8..484788137 100644
--- a/aegisub/src/dialog_version_check.cpp
+++ b/aegisub/src/dialog_version_check.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_version_check.cpp
 /// @brief Version Checker dialogue box and logic
diff --git a/aegisub/src/dialog_version_check.h b/aegisub/src/dialog_version_check.h
index d46b65d19..6e3c5be7e 100644
--- a/aegisub/src/dialog_version_check.h
+++ b/aegisub/src/dialog_version_check.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_version_check.h
 /// @see dialog_version_check.cpp
diff --git a/aegisub/src/dialog_video_details.cpp b/aegisub/src/dialog_video_details.cpp
index d0a44a6f1..67077292f 100644
--- a/aegisub/src/dialog_video_details.cpp
+++ b/aegisub/src/dialog_video_details.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_video_details.cpp
 /// @brief Video Details dialogue box
diff --git a/aegisub/src/dialog_video_details.h b/aegisub/src/dialog_video_details.h
index 4160397b0..9716db10c 100644
--- a/aegisub/src/dialog_video_details.h
+++ b/aegisub/src/dialog_video_details.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file dialog_video_details.h
 /// @see dialog_video_details.cpp
diff --git a/aegisub/src/export_fixstyle.cpp b/aegisub/src/export_fixstyle.cpp
index d29c7bff1..472fc45b6 100644
--- a/aegisub/src/export_fixstyle.cpp
+++ b/aegisub/src/export_fixstyle.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file export_fixstyle.cpp
 /// @brief Fix Styles export filter
diff --git a/aegisub/src/export_fixstyle.h b/aegisub/src/export_fixstyle.h
index 3b9698c08..f31e60080 100644
--- a/aegisub/src/export_fixstyle.h
+++ b/aegisub/src/export_fixstyle.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file export_fixstyle.h
 /// @see export_fixstyle.cpp
diff --git a/aegisub/src/export_framerate.cpp b/aegisub/src/export_framerate.cpp
index 6a3dfc88b..e24471744 100644
--- a/aegisub/src/export_framerate.cpp
+++ b/aegisub/src/export_framerate.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file export_framerate.cpp
 /// @brief Transform Framerate export filter
diff --git a/aegisub/src/export_framerate.h b/aegisub/src/export_framerate.h
index 23016c93b..96bf6e144 100644
--- a/aegisub/src/export_framerate.h
+++ b/aegisub/src/export_framerate.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file export_framerate.h
 /// @see export_framerate.cpp
diff --git a/aegisub/src/factory_manager.h b/aegisub/src/factory_manager.h
index d8eb77f18..f3be7ddbd 100644
--- a/aegisub/src/factory_manager.h
+++ b/aegisub/src/factory_manager.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file factory_manager.h
 /// @brief Template/base-class for factory classes
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index 52148f467..5cafcfb66 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ffmpegsource_common.cpp
 /// @brief Shared code for ffms video and audio providers
diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h
index cfa84e4f2..74403e298 100644
--- a/aegisub/src/ffmpegsource_common.h
+++ b/aegisub/src/ffmpegsource_common.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file ffmpegsource_common.h
 /// @see ffmpegsource_common.cpp
diff --git a/aegisub/src/fft.cpp b/aegisub/src/fft.cpp
index 657d56fff..ac321ef7e 100644
--- a/aegisub/src/fft.cpp
+++ b/aegisub/src/fft.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file fft.cpp
 /// @brief Fast Fourier-transform implementation
diff --git a/aegisub/src/fft.h b/aegisub/src/fft.h
index 6124d92ca..812a77362 100644
--- a/aegisub/src/fft.h
+++ b/aegisub/src/fft.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file fft.h
 /// @see fft.cpp
diff --git a/aegisub/src/font_file_lister.cpp b/aegisub/src/font_file_lister.cpp
index 195ac44b8..181bf61da 100644
--- a/aegisub/src/font_file_lister.cpp
+++ b/aegisub/src/font_file_lister.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file font_file_lister.cpp
 /// @brief Base-class for font collector implementations
diff --git a/aegisub/src/font_file_lister.h b/aegisub/src/font_file_lister.h
index a9399757b..7449e8b83 100644
--- a/aegisub/src/font_file_lister.h
+++ b/aegisub/src/font_file_lister.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file font_file_lister.h
 /// @see font_file_lister.cpp
diff --git a/aegisub/src/font_file_lister_fontconfig.cpp b/aegisub/src/font_file_lister_fontconfig.cpp
index ee490c786..37e4f4f35 100644
--- a/aegisub/src/font_file_lister_fontconfig.cpp
+++ b/aegisub/src/font_file_lister_fontconfig.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file font_file_lister_fontconfig.cpp
 /// @brief Font Config-based font collector
diff --git a/aegisub/src/font_file_lister_fontconfig.h b/aegisub/src/font_file_lister_fontconfig.h
index 7df85fc33..6ac59aa90 100644
--- a/aegisub/src/font_file_lister_fontconfig.h
+++ b/aegisub/src/font_file_lister_fontconfig.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file font_file_lister_fontconfig.h
 /// @see font_file_lister_fontconfig.cpp
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index 6300cf42f..a8bb5ea33 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file frame_main.cpp
 /// @brief Main window creation and control management
diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h
index ff243332d..2a2b4e89d 100644
--- a/aegisub/src/frame_main.h
+++ b/aegisub/src/frame_main.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file frame_main.h
 /// @see frame_main.cpp
diff --git a/aegisub/src/gl_text.cpp b/aegisub/src/gl_text.cpp
index 3ae7d9801..5a230fd7f 100644
--- a/aegisub/src/gl_text.cpp
+++ b/aegisub/src/gl_text.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file gl_text.cpp
 /// @brief Create and render text using OpenGL
diff --git a/aegisub/src/gl_text.h b/aegisub/src/gl_text.h
index d162d7cc6..a693e9d85 100644
--- a/aegisub/src/gl_text.h
+++ b/aegisub/src/gl_text.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file gl_text.h
 /// @see gl_text.cpp
diff --git a/aegisub/src/gl_wrap.cpp b/aegisub/src/gl_wrap.cpp
index d6d28e8f3..aaba6b933 100644
--- a/aegisub/src/gl_wrap.cpp
+++ b/aegisub/src/gl_wrap.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file gl_wrap.cpp
 /// @brief Convenience functions for drawing various geometric primitives on an OpenGL surface
diff --git a/aegisub/src/gl_wrap.h b/aegisub/src/gl_wrap.h
index 1dcb26f05..66a8ac51b 100644
--- a/aegisub/src/gl_wrap.h
+++ b/aegisub/src/gl_wrap.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file gl_wrap.h
 /// @see gl_wrap.cpp
diff --git a/aegisub/src/help_button.cpp b/aegisub/src/help_button.cpp
index 980d4a2b6..e9513782a 100644
--- a/aegisub/src/help_button.cpp
+++ b/aegisub/src/help_button.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file help_button.cpp
 /// @brief Push-button opening the help file at a specified section
diff --git a/aegisub/src/help_button.h b/aegisub/src/help_button.h
index c9b635dae..1eea5e441 100644
--- a/aegisub/src/help_button.h
+++ b/aegisub/src/help_button.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file help_button.h
 /// @see help_button.cpp
diff --git a/aegisub/src/hotkey.cpp b/aegisub/src/hotkey.cpp
index 0e920ed57..fa37e2042 100644
--- a/aegisub/src/hotkey.cpp
+++ b/aegisub/src/hotkey.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file hotkey.cpp
 /// @brief Hotkey handler
diff --git a/aegisub/src/hotkey_data_view_model.cpp b/aegisub/src/hotkey_data_view_model.cpp
index e69635cca..ec1b7ada0 100644
--- a/aegisub/src/hotkey_data_view_model.cpp
+++ b/aegisub/src/hotkey_data_view_model.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file hotkey_data_view_model.cpp
 /// @see hotkey_data_view_model.h
diff --git a/aegisub/src/hotkey_data_view_model.h b/aegisub/src/hotkey_data_view_model.h
index 50b9a8f7a..60f4279f9 100644
--- a/aegisub/src/hotkey_data_view_model.h
+++ b/aegisub/src/hotkey_data_view_model.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file hotkey_data_view_model.h
 /// @see hotkey_data_view_model.cpp
diff --git a/aegisub/src/include/aegisub/audio_player.h b/aegisub/src/include/aegisub/audio_player.h
index e39fdc918..417fadc28 100644
--- a/aegisub/src/include/aegisub/audio_player.h
+++ b/aegisub/src/include/aegisub/audio_player.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_player.h
 /// @brief Declaration of base-class for audio players
diff --git a/aegisub/src/include/aegisub/audio_provider.h b/aegisub/src/include/aegisub/audio_provider.h
index fa7e67191..ceb5ba0af 100644
--- a/aegisub/src/include/aegisub/audio_provider.h
+++ b/aegisub/src/include/aegisub/audio_provider.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file audio_provider.h
 /// @brief Declaration of base-class for audio providers
diff --git a/aegisub/src/include/aegisub/hotkey.h b/aegisub/src/include/aegisub/hotkey.h
index c6c9d3425..395c98a5c 100644
--- a/aegisub/src/include/aegisub/hotkey.h
+++ b/aegisub/src/include/aegisub/hotkey.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file hotkey.h
 /// @brief Hotkey handler
diff --git a/aegisub/src/include/aegisub/menu.h b/aegisub/src/include/aegisub/menu.h
index 0760819ea..3c7b6e61a 100644
--- a/aegisub/src/include/aegisub/menu.h
+++ b/aegisub/src/include/aegisub/menu.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file menu.h
 /// @brief Dynamic menu and toolbar generator.
diff --git a/aegisub/src/include/aegisub/spellchecker.h b/aegisub/src/include/aegisub/spellchecker.h
index 709594b3b..d06d06c0d 100644
--- a/aegisub/src/include/aegisub/spellchecker.h
+++ b/aegisub/src/include/aegisub/spellchecker.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spellchecker.h
 /// @brief Declaration of base-class for spell checkers
diff --git a/aegisub/src/include/aegisub/subtitles_provider.h b/aegisub/src/include/aegisub/subtitles_provider.h
index 4bff02b44..ff3c3c1f7 100644
--- a/aegisub/src/include/aegisub/subtitles_provider.h
+++ b/aegisub/src/include/aegisub/subtitles_provider.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitles_provider.h
 /// @brief Declaration of base-class for subtitle renderers
diff --git a/aegisub/src/include/aegisub/toolbar.h b/aegisub/src/include/aegisub/toolbar.h
index c1259b36f..1d3749eb9 100644
--- a/aegisub/src/include/aegisub/toolbar.h
+++ b/aegisub/src/include/aegisub/toolbar.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file toolbar.h
 /// @brief Dynamic toolbar generator.
diff --git a/aegisub/src/include/aegisub/video_provider.h b/aegisub/src/include/aegisub/video_provider.h
index d6981cd5b..9fbd0e9f9 100644
--- a/aegisub/src/include/aegisub/video_provider.h
+++ b/aegisub/src/include/aegisub/video_provider.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider.h
 /// @brief Declaration of base-class for video providers
diff --git a/aegisub/src/kana_table.cpp b/aegisub/src/kana_table.cpp
index e24db4fad..a05df5a0c 100644
--- a/aegisub/src/kana_table.cpp
+++ b/aegisub/src/kana_table.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file kana_table.cpp
 /// @brief Data about the Japanese kana syllabary used by kanji karaoke timing copying
diff --git a/aegisub/src/kana_table.h b/aegisub/src/kana_table.h
index 3df7b12d3..4aad3d1d5 100644
--- a/aegisub/src/kana_table.h
+++ b/aegisub/src/kana_table.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file kana_table.h
 /// @see kana_table.cpp
diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json
index b13fd3068..32653b0e2 100644
--- a/aegisub/src/libresrc/default_config.json
+++ b/aegisub/src/libresrc/default_config.json
@@ -540,7 +540,6 @@
 	},
 
 	"Version" : {
-		"Id" : "$Id$",
 		"Last Version" : 4040,
 		"Next Check" : 0
 	},
diff --git a/aegisub/src/libresrc/libresrc.cpp b/aegisub/src/libresrc/libresrc.cpp
index d5c3657fe..8b868c2f4 100644
--- a/aegisub/src/libresrc/libresrc.cpp
+++ b/aegisub/src/libresrc/libresrc.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 #include "../config.h"
 
diff --git a/aegisub/src/libresrc/libresrc.h b/aegisub/src/libresrc/libresrc.h
index 3a1ca85c0..3b6eb6770 100644
--- a/aegisub/src/libresrc/libresrc.h
+++ b/aegisub/src/libresrc/libresrc.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 #ifndef AGI_PRE
 #include <string>
diff --git a/aegisub/src/libresrc/osx/default_config.json b/aegisub/src/libresrc/osx/default_config.json
index 7f6800fe8..c2ca514b1 100644
--- a/aegisub/src/libresrc/osx/default_config.json
+++ b/aegisub/src/libresrc/osx/default_config.json
@@ -540,7 +540,6 @@
 	},
 
 	"Version" : {
-		"Id" : "$Id$",
 		"Last Version" : 4040,
 		"Next Check" : 0
 	},
diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp
index 1062f7f28..be71400e6 100644
--- a/aegisub/src/main.cpp
+++ b/aegisub/src/main.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file main.cpp
 /// @brief Main entry point, as well as crash handling
diff --git a/aegisub/src/main.h b/aegisub/src/main.h
index df804826b..e99f3ecca 100644
--- a/aegisub/src/main.h
+++ b/aegisub/src/main.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file main.h
 /// @see main.cpp
diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp
index 362841f01..430cb32d8 100644
--- a/aegisub/src/menu.cpp
+++ b/aegisub/src/menu.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file menu.cpp
 /// @brief Dynamic menu and toolbar generator.
diff --git a/aegisub/src/mkv_wrap.cpp b/aegisub/src/mkv_wrap.cpp
index 58da81792..35ea2b77c 100644
--- a/aegisub/src/mkv_wrap.cpp
+++ b/aegisub/src/mkv_wrap.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file mkv_wrap.cpp
 /// @brief High-level interface for obtaining various data from Matroska files
diff --git a/aegisub/src/mkv_wrap.h b/aegisub/src/mkv_wrap.h
index 2530ab19f..57b6a8566 100644
--- a/aegisub/src/mkv_wrap.h
+++ b/aegisub/src/mkv_wrap.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file mkv_wrap.h
 /// @see mkv_wrap.cpp
diff --git a/aegisub/src/osx_utils.mm b/aegisub/src/osx_utils.mm
index 8134d51d9..b52160270 100644
--- a/aegisub/src/osx_utils.mm
+++ b/aegisub/src/osx_utils.mm
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file osx_utils.mm
 /// @see utils.h
diff --git a/aegisub/src/pen.cpp b/aegisub/src/pen.cpp
index 9082ab956..14dbeb3db 100644
--- a/aegisub/src/pen.cpp
+++ b/aegisub/src/pen.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 #include "config.h"
 
diff --git a/aegisub/src/pen.h b/aegisub/src/pen.h
index 2ede66338..3a17c4285 100644
--- a/aegisub/src/pen.h
+++ b/aegisub/src/pen.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 #ifndef AGI_PRE
 #include <wx/pen.h>
diff --git a/aegisub/src/persist_location.cpp b/aegisub/src/persist_location.cpp
index b8a7e8e89..84d579b84 100644
--- a/aegisub/src/persist_location.cpp
+++ b/aegisub/src/persist_location.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file persist_location.cpp
 /// @see persist_location.h
diff --git a/aegisub/src/persist_location.h b/aegisub/src/persist_location.h
index e9f84d5a2..f433f6640 100644
--- a/aegisub/src/persist_location.h
+++ b/aegisub/src/persist_location.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file persist_location.h
 /// @see persist_location.cpp
diff --git a/aegisub/src/placeholder_ctrl.h b/aegisub/src/placeholder_ctrl.h
index f6c068727..a88ade6e0 100644
--- a/aegisub/src/placeholder_ctrl.h
+++ b/aegisub/src/placeholder_ctrl.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file placeholder_ctrl.h
 /// @ingroup custom_control
diff --git a/aegisub/src/plugin_manager.cpp b/aegisub/src/plugin_manager.cpp
index 952e08a87..fa30ecba9 100644
--- a/aegisub/src/plugin_manager.cpp
+++ b/aegisub/src/plugin_manager.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file plugin_manager.cpp
 /// @brief Keep track of and set up variable parts of the application
diff --git a/aegisub/src/plugin_manager.h b/aegisub/src/plugin_manager.h
index db55741aa..3144b68bb 100644
--- a/aegisub/src/plugin_manager.h
+++ b/aegisub/src/plugin_manager.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file plugin_manager.h
 /// @see plugin_manager.cpp
diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp
index 9ac746fa6..4f77d0191 100644
--- a/aegisub/src/preferences.cpp
+++ b/aegisub/src/preferences.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file preferences.cpp
 /// @brief Preferences dialogue
diff --git a/aegisub/src/preferences.h b/aegisub/src/preferences.h
index 851cdbf95..63d0be474 100644
--- a/aegisub/src/preferences.h
+++ b/aegisub/src/preferences.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file preferences.h
 /// @brief Preferences dialogue
diff --git a/aegisub/src/preferences_base.cpp b/aegisub/src/preferences_base.cpp
index 5dbc4a5d9..521b57715 100644
--- a/aegisub/src/preferences_base.cpp
+++ b/aegisub/src/preferences_base.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file preferences_base.cpp
 /// @brief Base preferences dialogue classes
diff --git a/aegisub/src/preferences_base.h b/aegisub/src/preferences_base.h
index 1e9de73f3..dce5b48b4 100644
--- a/aegisub/src/preferences_base.h
+++ b/aegisub/src/preferences_base.h
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file preferences_base.h
 /// @brief Base preferences dialogue classes
diff --git a/aegisub/src/scintilla_text_ctrl.cpp b/aegisub/src/scintilla_text_ctrl.cpp
index a664373d6..83bb765ef 100644
--- a/aegisub/src/scintilla_text_ctrl.cpp
+++ b/aegisub/src/scintilla_text_ctrl.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file scintilla_text_ctrl.cpp
 /// @brief Customised version of wxStyledTextControl used for main edit box
diff --git a/aegisub/src/scintilla_text_ctrl.h b/aegisub/src/scintilla_text_ctrl.h
index 117ebb684..ee121517a 100644
--- a/aegisub/src/scintilla_text_ctrl.h
+++ b/aegisub/src/scintilla_text_ctrl.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file scintilla_text_ctrl.h
 /// @see scintilla_text_ctrl.cpp
diff --git a/aegisub/src/selection_controller.h b/aegisub/src/selection_controller.h
index e73cffaed..916dc9c25 100644
--- a/aegisub/src/selection_controller.h
+++ b/aegisub/src/selection_controller.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file selection_controller.h
 /// @ingroup controllers
diff --git a/aegisub/src/spellchecker.cpp b/aegisub/src/spellchecker.cpp
index ae510817d..453872018 100644
--- a/aegisub/src/spellchecker.cpp
+++ b/aegisub/src/spellchecker.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spellchecker.cpp
 /// @brief Implementatin of base-class for spell checkers
diff --git a/aegisub/src/spellchecker_hunspell.cpp b/aegisub/src/spellchecker_hunspell.cpp
index df0be56a6..a8de07e25 100644
--- a/aegisub/src/spellchecker_hunspell.cpp
+++ b/aegisub/src/spellchecker_hunspell.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spellchecker_hunspell.cpp
 /// @brief Hunspell-based spell checker implementation
diff --git a/aegisub/src/spellchecker_hunspell.h b/aegisub/src/spellchecker_hunspell.h
index aa3cff81f..4d98968a4 100644
--- a/aegisub/src/spellchecker_hunspell.h
+++ b/aegisub/src/spellchecker_hunspell.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spellchecker_hunspell.h
 /// @see spellchecker_hunspell.cpp
diff --git a/aegisub/src/spline.cpp b/aegisub/src/spline.cpp
index 4a3d75a1f..3953f2cda 100644
--- a/aegisub/src/spline.cpp
+++ b/aegisub/src/spline.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spline.cpp
 /// @brief Manage vector drawings for visual typesetting tools
diff --git a/aegisub/src/spline.h b/aegisub/src/spline.h
index daeb76865..787e9b607 100644
--- a/aegisub/src/spline.h
+++ b/aegisub/src/spline.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spline.h
 /// @see spline.cpp
diff --git a/aegisub/src/spline_curve.cpp b/aegisub/src/spline_curve.cpp
index 08407513a..0269583bc 100644
--- a/aegisub/src/spline_curve.cpp
+++ b/aegisub/src/spline_curve.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spline_curve.cpp
 /// @brief Handle bicubic splines (Bezier curves) in vector drawings
diff --git a/aegisub/src/spline_curve.h b/aegisub/src/spline_curve.h
index c8b113c51..9f7caa135 100644
--- a/aegisub/src/spline_curve.h
+++ b/aegisub/src/spline_curve.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file spline_curve.h
 /// @see spline_curve.cpp
diff --git a/aegisub/src/standard_paths.cpp b/aegisub/src/standard_paths.cpp
index 6ecc2d3a3..04921aac2 100644
--- a/aegisub/src/standard_paths.cpp
+++ b/aegisub/src/standard_paths.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file standard_paths.cpp
 /// @brief Encode and decode paths relative to various special locations
diff --git a/aegisub/src/standard_paths.h b/aegisub/src/standard_paths.h
index d342eb4e1..42e89974b 100644
--- a/aegisub/src/standard_paths.h
+++ b/aegisub/src/standard_paths.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file standard_paths.h
 /// @see standard_paths.cpp
diff --git a/aegisub/src/string_codec.cpp b/aegisub/src/string_codec.cpp
index 98a914887..2b1f6ceca 100644
--- a/aegisub/src/string_codec.cpp
+++ b/aegisub/src/string_codec.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file string_codec.cpp
 /// @brief Encode and decode strings so they can safely be stored inside fields in SSA/ASS files
diff --git a/aegisub/src/string_codec.h b/aegisub/src/string_codec.h
index 6b4404ae6..79fc0fd3d 100644
--- a/aegisub/src/string_codec.h
+++ b/aegisub/src/string_codec.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file string_codec.h
 /// @see string_codec.cpp
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index bb9e431cd..17a5530cc 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -27,8 +27,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_edit_box.cpp
 /// @brief Main subtitle editing area, including toolbars around the text control
diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h
index 7cd2c576b..86a8ecce1 100644
--- a/aegisub/src/subs_edit_box.h
+++ b/aegisub/src/subs_edit_box.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_edit_box.h
 /// @see subs_edit_box.cpp
diff --git a/aegisub/src/subs_edit_ctrl.cpp b/aegisub/src/subs_edit_ctrl.cpp
index b43b0d444..e11d6ba31 100644
--- a/aegisub/src/subs_edit_ctrl.cpp
+++ b/aegisub/src/subs_edit_ctrl.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_edit_ctrl.cpp
 /// @brief Main subtitle editing text control
diff --git a/aegisub/src/subs_edit_ctrl.h b/aegisub/src/subs_edit_ctrl.h
index 68287ca2e..dab6e4972 100644
--- a/aegisub/src/subs_edit_ctrl.h
+++ b/aegisub/src/subs_edit_ctrl.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_edit_ctrl.h
 /// @see subs_edit_ctrl.cpp
diff --git a/aegisub/src/subs_grid.cpp b/aegisub/src/subs_grid.cpp
index 3b93600b1..42461c1e6 100644
--- a/aegisub/src/subs_grid.cpp
+++ b/aegisub/src/subs_grid.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_grid.cpp
 /// @brief Subtitles grid control in main window
diff --git a/aegisub/src/subs_grid.h b/aegisub/src/subs_grid.h
index 1ed9dd977..bf48fd42a 100644
--- a/aegisub/src/subs_grid.h
+++ b/aegisub/src/subs_grid.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_grid.h
 /// @see subs_grid.cpp
diff --git a/aegisub/src/subs_preview.cpp b/aegisub/src/subs_preview.cpp
index bada83ba2..a0313f8b8 100644
--- a/aegisub/src/subs_preview.cpp
+++ b/aegisub/src/subs_preview.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_preview.cpp
 /// @brief Preview control using a dummy video provider and subtitles provider to render a preview
diff --git a/aegisub/src/subs_preview.h b/aegisub/src/subs_preview.h
index c3e57948b..c218a478a 100644
--- a/aegisub/src/subs_preview.h
+++ b/aegisub/src/subs_preview.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subs_preview.h
 /// @see subs_preview.cpp
diff --git a/aegisub/src/subtitle_format.cpp b/aegisub/src/subtitle_format.cpp
index 2606d0cdb..49bfd7a13 100644
--- a/aegisub/src/subtitle_format.cpp
+++ b/aegisub/src/subtitle_format.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format.cpp
 /// @brief Base class for subtitle format handlers
diff --git a/aegisub/src/subtitle_format.h b/aegisub/src/subtitle_format.h
index 91e90d1c6..c235ec3e1 100644
--- a/aegisub/src/subtitle_format.h
+++ b/aegisub/src/subtitle_format.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format.h
 /// @see subtitle_format.cpp
diff --git a/aegisub/src/subtitle_format_ass.cpp b/aegisub/src/subtitle_format_ass.cpp
index d5b0cb531..ce0498f39 100644
--- a/aegisub/src/subtitle_format_ass.cpp
+++ b/aegisub/src/subtitle_format_ass.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_ass.cpp
 /// @brief Reading/writing of SSA-lineage subtitles
diff --git a/aegisub/src/subtitle_format_ass.h b/aegisub/src/subtitle_format_ass.h
index d2bceceff..6ea9e2f51 100644
--- a/aegisub/src/subtitle_format_ass.h
+++ b/aegisub/src/subtitle_format_ass.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_ass.h
 /// @see subtitle_format_ass.cpp
diff --git a/aegisub/src/subtitle_format_encore.cpp b/aegisub/src/subtitle_format_encore.cpp
index 2300cee58..1c3295ca8 100644
--- a/aegisub/src/subtitle_format_encore.cpp
+++ b/aegisub/src/subtitle_format_encore.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_encore.cpp
 /// @brief Reading/writing Adobe Encore subtitle format
diff --git a/aegisub/src/subtitle_format_encore.h b/aegisub/src/subtitle_format_encore.h
index ad79811e7..ecf180ed9 100644
--- a/aegisub/src/subtitle_format_encore.h
+++ b/aegisub/src/subtitle_format_encore.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_encore.h
 /// @see subtitle_format_encore.cpp
diff --git a/aegisub/src/subtitle_format_microdvd.cpp b/aegisub/src/subtitle_format_microdvd.cpp
index e141e41d7..2d4b7c1b6 100644
--- a/aegisub/src/subtitle_format_microdvd.cpp
+++ b/aegisub/src/subtitle_format_microdvd.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_microdvd.cpp
 /// @brief Reading/writing MicroDVD subtitle format (.SUB)
diff --git a/aegisub/src/subtitle_format_microdvd.h b/aegisub/src/subtitle_format_microdvd.h
index f6709449b..3d68ccfce 100644
--- a/aegisub/src/subtitle_format_microdvd.h
+++ b/aegisub/src/subtitle_format_microdvd.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_microdvd.h
 /// @see subtitle_format_microdvd.cpp
diff --git a/aegisub/src/subtitle_format_mkv.cpp b/aegisub/src/subtitle_format_mkv.cpp
index 2d04e3b7e..99af9b209 100644
--- a/aegisub/src/subtitle_format_mkv.cpp
+++ b/aegisub/src/subtitle_format_mkv.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_mkv.cpp
 /// @brief Importing subtitles (plain, SSA, ASS) from Matroska files
diff --git a/aegisub/src/subtitle_format_mkv.h b/aegisub/src/subtitle_format_mkv.h
index 6042e1369..687bc28a6 100644
--- a/aegisub/src/subtitle_format_mkv.h
+++ b/aegisub/src/subtitle_format_mkv.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_mkv.h
 /// @see subtitle_format_mkv.cpp
diff --git a/aegisub/src/subtitle_format_srt.cpp b/aegisub/src/subtitle_format_srt.cpp
index 298b05e07..be67c7202 100644
--- a/aegisub/src/subtitle_format_srt.cpp
+++ b/aegisub/src/subtitle_format_srt.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_srt.cpp
 /// @brief Reading/writing SubRip format subtitles (.SRT)
diff --git a/aegisub/src/subtitle_format_srt.h b/aegisub/src/subtitle_format_srt.h
index 86b0c4e68..8ab43c793 100644
--- a/aegisub/src/subtitle_format_srt.h
+++ b/aegisub/src/subtitle_format_srt.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_srt.h
 /// @see subtitle_format_srt.cpp
diff --git a/aegisub/src/subtitle_format_transtation.cpp b/aegisub/src/subtitle_format_transtation.cpp
index ce0aea961..5c06f2fd1 100644
--- a/aegisub/src/subtitle_format_transtation.cpp
+++ b/aegisub/src/subtitle_format_transtation.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_transtation.cpp
 /// @brief Reading/writing Transtation-compatible subtitles
diff --git a/aegisub/src/subtitle_format_transtation.h b/aegisub/src/subtitle_format_transtation.h
index 9defbc387..19a7a8257 100644
--- a/aegisub/src/subtitle_format_transtation.h
+++ b/aegisub/src/subtitle_format_transtation.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_transtation.h
 /// @see subtitle_format_transtation.cpp
diff --git a/aegisub/src/subtitle_format_ttxt.cpp b/aegisub/src/subtitle_format_ttxt.cpp
index 964edb910..d981d2f67 100644
--- a/aegisub/src/subtitle_format_ttxt.cpp
+++ b/aegisub/src/subtitle_format_ttxt.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_ttxt.cpp
 /// @brief Reading/writing MPEG-4 Timed Text subtitles in TTXT XML format
diff --git a/aegisub/src/subtitle_format_ttxt.h b/aegisub/src/subtitle_format_ttxt.h
index 7a20095be..f7db9b85c 100644
--- a/aegisub/src/subtitle_format_ttxt.h
+++ b/aegisub/src/subtitle_format_ttxt.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_ttxt.h
 /// @see subtitle_format_ttxt.cpp
diff --git a/aegisub/src/subtitle_format_txt.cpp b/aegisub/src/subtitle_format_txt.cpp
index e50c9a1ec..2bfb6bd33 100644
--- a/aegisub/src/subtitle_format_txt.cpp
+++ b/aegisub/src/subtitle_format_txt.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_txt.cpp
 /// @brief Importing/exporting subtitles to untimed plain text
diff --git a/aegisub/src/subtitle_format_txt.h b/aegisub/src/subtitle_format_txt.h
index f36a560b0..50a3444df 100644
--- a/aegisub/src/subtitle_format_txt.h
+++ b/aegisub/src/subtitle_format_txt.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitle_format_txt.h
 /// @see subtitle_format_txt.cpp
diff --git a/aegisub/src/subtitles_provider.cpp b/aegisub/src/subtitles_provider.cpp
index 943fa507c..d210840b1 100644
--- a/aegisub/src/subtitles_provider.cpp
+++ b/aegisub/src/subtitles_provider.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitles_provider.cpp
 /// @brief Base class for subtitle renderers
diff --git a/aegisub/src/subtitles_provider_csri.cpp b/aegisub/src/subtitles_provider_csri.cpp
index e4b635f67..d51ce2700 100644
--- a/aegisub/src/subtitles_provider_csri.cpp
+++ b/aegisub/src/subtitles_provider_csri.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitles_provider_csri.cpp
 /// @brief Wrapper for CSRI-based subtitle renderers
diff --git a/aegisub/src/subtitles_provider_csri.h b/aegisub/src/subtitles_provider_csri.h
index 9ad66679b..34ae3e815 100644
--- a/aegisub/src/subtitles_provider_csri.h
+++ b/aegisub/src/subtitles_provider_csri.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitles_provider_csri.h
 /// @see subtitles_provider_csri.cpp
diff --git a/aegisub/src/subtitles_provider_libass.cpp b/aegisub/src/subtitles_provider_libass.cpp
index a396bd7c3..c6e9b5092 100644
--- a/aegisub/src/subtitles_provider_libass.cpp
+++ b/aegisub/src/subtitles_provider_libass.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitles_provider_libass.cpp
 /// @brief libass-based subtitle renderer
diff --git a/aegisub/src/subtitles_provider_libass.h b/aegisub/src/subtitles_provider_libass.h
index 3148190a3..701135996 100644
--- a/aegisub/src/subtitles_provider_libass.h
+++ b/aegisub/src/subtitles_provider_libass.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file subtitles_provider_libass.h
 /// @see subtitles_provider_libass.cpp
diff --git a/aegisub/src/text_file_reader.cpp b/aegisub/src/text_file_reader.cpp
index 424b1ee5c..c5c501116 100644
--- a/aegisub/src/text_file_reader.cpp
+++ b/aegisub/src/text_file_reader.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file text_file_reader.cpp
 /// @brief Read plain text files line by line
diff --git a/aegisub/src/text_file_reader.h b/aegisub/src/text_file_reader.h
index d3785a29c..d0f8a717e 100644
--- a/aegisub/src/text_file_reader.h
+++ b/aegisub/src/text_file_reader.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file text_file_reader.h
 /// @see text_file_reader.cpp
diff --git a/aegisub/src/text_file_writer.cpp b/aegisub/src/text_file_writer.cpp
index fa71bb951..50c75afa8 100644
--- a/aegisub/src/text_file_writer.cpp
+++ b/aegisub/src/text_file_writer.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file text_file_writer.cpp
 /// @brief Write plain text files line by line
diff --git a/aegisub/src/text_file_writer.h b/aegisub/src/text_file_writer.h
index b0b8cfa76..5f345e63c 100644
--- a/aegisub/src/text_file_writer.h
+++ b/aegisub/src/text_file_writer.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file text_file_writer.h
 /// @see text_file_writer.cpp
diff --git a/aegisub/src/thesaurus.cpp b/aegisub/src/thesaurus.cpp
index 43acbe5f2..00f8f6b27 100644
--- a/aegisub/src/thesaurus.cpp
+++ b/aegisub/src/thesaurus.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file thesaurus.cpp
 /// @brief Thesaurus implementation
diff --git a/aegisub/src/thesaurus.h b/aegisub/src/thesaurus.h
index 26c18b49a..8ef41380b 100644
--- a/aegisub/src/thesaurus.h
+++ b/aegisub/src/thesaurus.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file thesaurus.h
 /// @see thesaurus.cpp
diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp
index d888fa504..e94baaa48 100644
--- a/aegisub/src/threaded_frame_source.cpp
+++ b/aegisub/src/threaded_frame_source.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file threaded_frame_source.cpp
 /// @see threaded_frame_source.h
diff --git a/aegisub/src/threaded_frame_source.h b/aegisub/src/threaded_frame_source.h
index e0da9d51b..29021b4c9 100644
--- a/aegisub/src/threaded_frame_source.h
+++ b/aegisub/src/threaded_frame_source.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file threaded_frame_source.h
 /// @see threaded_frame_source.cpp
diff --git a/aegisub/src/time_range.h b/aegisub/src/time_range.h
index a77705311..2b09b9dc1 100644
--- a/aegisub/src/time_range.h
+++ b/aegisub/src/time_range.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file time_range.h
 /// @ingroup audio_ui
diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp
index 312a5adb3..acefe6a2a 100644
--- a/aegisub/src/timeedit_ctrl.cpp
+++ b/aegisub/src/timeedit_ctrl.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file timeedit_ctrl.cpp
 /// @brief Edit-control for editing SSA-format timestamps
diff --git a/aegisub/src/timeedit_ctrl.h b/aegisub/src/timeedit_ctrl.h
index 30aa68063..d34a4a083 100644
--- a/aegisub/src/timeedit_ctrl.h
+++ b/aegisub/src/timeedit_ctrl.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file timeedit_ctrl.h
 /// @see timeedit_ctrl.cpp
diff --git a/aegisub/src/toggle_bitmap.cpp b/aegisub/src/toggle_bitmap.cpp
index 4b4072be2..5911efc71 100644
--- a/aegisub/src/toggle_bitmap.cpp
+++ b/aegisub/src/toggle_bitmap.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file toggle_bitmap.cpp
 /// @brief Toggle-button rendered as a bitmap on a coloured background
diff --git a/aegisub/src/toggle_bitmap.h b/aegisub/src/toggle_bitmap.h
index df74f1fed..f6edac24a 100644
--- a/aegisub/src/toggle_bitmap.h
+++ b/aegisub/src/toggle_bitmap.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file toggle_bitmap.h
 /// @see toggle_bitmap.cpp
diff --git a/aegisub/src/toolbar.cpp b/aegisub/src/toolbar.cpp
index 117a6c784..14c32e25c 100644
--- a/aegisub/src/toolbar.cpp
+++ b/aegisub/src/toolbar.cpp
@@ -11,8 +11,6 @@
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// $Id$
 
 /// @file menutool.cpp
 /// @brief Dynamic menu toolbar generator.
diff --git a/aegisub/src/tooltip_manager.cpp b/aegisub/src/tooltip_manager.cpp
index 7fbdee946..ec4c08516 100644
--- a/aegisub/src/tooltip_manager.cpp
+++ b/aegisub/src/tooltip_manager.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file tooltip_manager.cpp
 /// @brief Generate tooltips for controls by combining a base text and any hotkeys found for the function
diff --git a/aegisub/src/tooltip_manager.h b/aegisub/src/tooltip_manager.h
index cd47637fd..e3a8274d0 100644
--- a/aegisub/src/tooltip_manager.h
+++ b/aegisub/src/tooltip_manager.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file tooltip_manager.h
 /// @see tooltip_manager.cpp
diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp
index 5eb90888b..b8c6e85aa 100644
--- a/aegisub/src/utils.cpp
+++ b/aegisub/src/utils.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file utils.cpp
 /// @brief Misc. utility functions
diff --git a/aegisub/src/utils.h b/aegisub/src/utils.h
index 593938750..75dc7017f 100644
--- a/aegisub/src/utils.h
+++ b/aegisub/src/utils.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file utils.h
 /// @see utils.cpp
diff --git a/aegisub/src/validators.cpp b/aegisub/src/validators.cpp
index 664c5d617..49ec63b7b 100644
--- a/aegisub/src/validators.cpp
+++ b/aegisub/src/validators.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file validators.cpp
 /// @brief Various validators for wx
diff --git a/aegisub/src/validators.h b/aegisub/src/validators.h
index fae3da599..d53ddeff6 100644
--- a/aegisub/src/validators.h
+++ b/aegisub/src/validators.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file validators.h
 /// @see validators.cpp
diff --git a/aegisub/src/variable_data.cpp b/aegisub/src/variable_data.cpp
index f8dfc9805..3788964ab 100644
--- a/aegisub/src/variable_data.cpp
+++ b/aegisub/src/variable_data.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file variable_data.cpp
 /// @brief A variant-type implementation
diff --git a/aegisub/src/variable_data.h b/aegisub/src/variable_data.h
index 01bfd9328..121069adb 100644
--- a/aegisub/src/variable_data.h
+++ b/aegisub/src/variable_data.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file variable_data.h
 /// @see variable_data.cpp
diff --git a/aegisub/src/vector2d.cpp b/aegisub/src/vector2d.cpp
index d1e3640ca..c4a8b54db 100644
--- a/aegisub/src/vector2d.cpp
+++ b/aegisub/src/vector2d.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file vector2d.cpp
 /// @brief 2D mathematical vector used in visual typesetting
diff --git a/aegisub/src/vector2d.h b/aegisub/src/vector2d.h
index 7f3d6e283..c91682d7c 100644
--- a/aegisub/src/vector2d.h
+++ b/aegisub/src/vector2d.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file vector2d.h
 /// @see vector2d.cpp
diff --git a/aegisub/src/version.cpp b/aegisub/src/version.cpp
index 47a2e0c4d..4b60cfefb 100644
--- a/aegisub/src/version.cpp
+++ b/aegisub/src/version.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file version.cpp
 /// @brief Derive and return various information about the build and version at runtime
diff --git a/aegisub/src/version.h b/aegisub/src/version.h
index 9fc304b42..d413d634f 100644
--- a/aegisub/src/version.h
+++ b/aegisub/src/version.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file version.h
 /// @see version.cpp
diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp
index ea97128b7..8456badb8 100644
--- a/aegisub/src/video_box.cpp
+++ b/aegisub/src/video_box.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_box.cpp
 /// @brief The video area in the main window, including surrounding tool bars
diff --git a/aegisub/src/video_box.h b/aegisub/src/video_box.h
index ba0981d5b..46c41d5f9 100644
--- a/aegisub/src/video_box.h
+++ b/aegisub/src/video_box.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_box.h
 /// @see video_box.cpp
diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp
index bdc0d829d..e91db03dd 100644
--- a/aegisub/src/video_context.cpp
+++ b/aegisub/src/video_context.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_context.cpp
 /// @brief Keep track of loaded video
diff --git a/aegisub/src/video_context.h b/aegisub/src/video_context.h
index fc749db59..429f6a065 100644
--- a/aegisub/src/video_context.h
+++ b/aegisub/src/video_context.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_context.h
 /// @see video_context.cpp
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index d2cfae86e..29771e704 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_display.cpp
 /// @brief Control displaying a video frame obtained from the video context
diff --git a/aegisub/src/video_display.h b/aegisub/src/video_display.h
index 5e5bf91f2..c9bf08140 100644
--- a/aegisub/src/video_display.h
+++ b/aegisub/src/video_display.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_display.h
 /// @see video_display.cpp
diff --git a/aegisub/src/video_frame.cpp b/aegisub/src/video_frame.cpp
index f68f9a3cd..4055e3245 100644
--- a/aegisub/src/video_frame.cpp
+++ b/aegisub/src/video_frame.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_frame.cpp
 /// @brief Wrapper around a frame of video data
diff --git a/aegisub/src/video_frame.h b/aegisub/src/video_frame.h
index e2f7f282e..a127cfed8 100644
--- a/aegisub/src/video_frame.h
+++ b/aegisub/src/video_frame.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_frame.h
 /// @see video_frame.cpp
diff --git a/aegisub/src/video_out_gl.cpp b/aegisub/src/video_out_gl.cpp
index 088335c92..007704022 100644
--- a/aegisub/src/video_out_gl.cpp
+++ b/aegisub/src/video_out_gl.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_out_gl.cpp
 /// @brief OpenGL based video renderer
diff --git a/aegisub/src/video_out_gl.h b/aegisub/src/video_out_gl.h
index 7c67c26ef..1d3927714 100644
--- a/aegisub/src/video_out_gl.h
+++ b/aegisub/src/video_out_gl.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_out_gl.h
 /// @brief OpenGL based video renderer
diff --git a/aegisub/src/video_provider_avs.cpp b/aegisub/src/video_provider_avs.cpp
index af4b5a069..969c46722 100644
--- a/aegisub/src/video_provider_avs.cpp
+++ b/aegisub/src/video_provider_avs.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_avs.cpp
 /// @brief Avisynth-based video provider
diff --git a/aegisub/src/video_provider_avs.h b/aegisub/src/video_provider_avs.h
index 636664b45..f178cae0c 100644
--- a/aegisub/src/video_provider_avs.h
+++ b/aegisub/src/video_provider_avs.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_avs.h
 /// @see video_provider_avs.cpp
diff --git a/aegisub/src/video_provider_cache.cpp b/aegisub/src/video_provider_cache.cpp
index 009e4c083..7b94fd3cd 100644
--- a/aegisub/src/video_provider_cache.cpp
+++ b/aegisub/src/video_provider_cache.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_cache.cpp
 /// @brief Aggregate video provider caching previously requested frames
diff --git a/aegisub/src/video_provider_cache.h b/aegisub/src/video_provider_cache.h
index d05a8805b..27e64255a 100644
--- a/aegisub/src/video_provider_cache.h
+++ b/aegisub/src/video_provider_cache.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_cache.h
 /// @see video_provider_cache.cpp
diff --git a/aegisub/src/video_provider_dummy.cpp b/aegisub/src/video_provider_dummy.cpp
index e64d637fd..bb0c4a117 100644
--- a/aegisub/src/video_provider_dummy.cpp
+++ b/aegisub/src/video_provider_dummy.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_dummy.cpp
 /// @brief Video provider returning a constant frame
diff --git a/aegisub/src/video_provider_dummy.h b/aegisub/src/video_provider_dummy.h
index 841c278d0..36e90f464 100644
--- a/aegisub/src/video_provider_dummy.h
+++ b/aegisub/src/video_provider_dummy.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_dummy.h
 /// @see video_provider_dummy.cpp
diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp
index f131a773b..7533bc12e 100644
--- a/aegisub/src/video_provider_ffmpegsource.cpp
+++ b/aegisub/src/video_provider_ffmpegsource.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_ffmpegsource.cpp
 /// @brief FFmpegSource2-based video provider
diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h
index f6ea22865..63aa1ac1e 100644
--- a/aegisub/src/video_provider_ffmpegsource.h
+++ b/aegisub/src/video_provider_ffmpegsource.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_ffmpegsource.h
 /// @see video_provider_ffmpegsource.cpp
diff --git a/aegisub/src/video_provider_manager.cpp b/aegisub/src/video_provider_manager.cpp
index 79981ec99..a78a1663a 100644
--- a/aegisub/src/video_provider_manager.cpp
+++ b/aegisub/src/video_provider_manager.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_manager.cpp
 /// @brief Keep track of installed video providers
diff --git a/aegisub/src/video_provider_manager.h b/aegisub/src/video_provider_manager.h
index 774856e73..8a5893d8d 100644
--- a/aegisub/src/video_provider_manager.h
+++ b/aegisub/src/video_provider_manager.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_manager.h
 /// @see video_provider_manager.cpp
diff --git a/aegisub/src/video_provider_yuv4mpeg.cpp b/aegisub/src/video_provider_yuv4mpeg.cpp
index fb5499b51..4c78afd3b 100644
--- a/aegisub/src/video_provider_yuv4mpeg.cpp
+++ b/aegisub/src/video_provider_yuv4mpeg.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_yuv4mpeg.cpp
 /// @brief Video provider reading YUV4MPEG files directly without depending on external libraries
diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/aegisub/src/video_provider_yuv4mpeg.h
index 4e73fc168..b2479fc31 100644
--- a/aegisub/src/video_provider_yuv4mpeg.h
+++ b/aegisub/src/video_provider_yuv4mpeg.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_provider_yuv4mpeg.h
 /// @see video_provider_yuv4mpeg.cpp
diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp
index be74b972b..7ee2999d7 100644
--- a/aegisub/src/video_slider.cpp
+++ b/aegisub/src/video_slider.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_slider.cpp
 /// @brief Seek-bar control for video
diff --git a/aegisub/src/video_slider.h b/aegisub/src/video_slider.h
index 581835e6d..a5a9d1895 100644
--- a/aegisub/src/video_slider.h
+++ b/aegisub/src/video_slider.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file video_slider.h
 /// @see video_slider.cpp
diff --git a/aegisub/src/visual_feature.cpp b/aegisub/src/visual_feature.cpp
index 9ef017a23..250ba1d61 100644
--- a/aegisub/src/visual_feature.cpp
+++ b/aegisub/src/visual_feature.cpp
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_feature->cpp
 /// @brief Feature on video the user can interact with using mouse
diff --git a/aegisub/src/visual_feature.h b/aegisub/src/visual_feature.h
index 669819b33..301446909 100644
--- a/aegisub/src/visual_feature.h
+++ b/aegisub/src/visual_feature.h
@@ -26,8 +26,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_feature->h
 /// @see visual_feature->cpp
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index 5b324e1d4..b68044814 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool.cpp
 /// @brief Base class for visual typesetting functions
diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h
index 16f229c19..2045792f0 100644
--- a/aegisub/src/visual_tool.h
+++ b/aegisub/src/visual_tool.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool.h
 /// @see visual_tool.cpp
diff --git a/aegisub/src/visual_tool_clip.cpp b/aegisub/src/visual_tool_clip.cpp
index 24fb4a61d..8d77ff25a 100644
--- a/aegisub/src/visual_tool_clip.cpp
+++ b/aegisub/src/visual_tool_clip.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_clip.cpp
 /// @brief Rectangular clipping visual typesetting tool
diff --git a/aegisub/src/visual_tool_clip.h b/aegisub/src/visual_tool_clip.h
index 658d63e05..d6d4a236a 100644
--- a/aegisub/src/visual_tool_clip.h
+++ b/aegisub/src/visual_tool_clip.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_clip.h
 /// @see visual_tool_clip.cpp
diff --git a/aegisub/src/visual_tool_cross.cpp b/aegisub/src/visual_tool_cross.cpp
index 1a8057b20..d816bcd46 100644
--- a/aegisub/src/visual_tool_cross.cpp
+++ b/aegisub/src/visual_tool_cross.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_cross.cpp
 /// @brief Crosshair double-click-to-position visual typesetting tool
diff --git a/aegisub/src/visual_tool_cross.h b/aegisub/src/visual_tool_cross.h
index d674c6ffd..75c7e2259 100644
--- a/aegisub/src/visual_tool_cross.h
+++ b/aegisub/src/visual_tool_cross.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_cross.h
 /// @see visual_tool_cross.cpp
diff --git a/aegisub/src/visual_tool_drag.cpp b/aegisub/src/visual_tool_drag.cpp
index 9f7d737e2..77c8b9215 100644
--- a/aegisub/src/visual_tool_drag.cpp
+++ b/aegisub/src/visual_tool_drag.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_drag.cpp
 /// @brief Position all visible subtitles by dragging visual typesetting tool
diff --git a/aegisub/src/visual_tool_drag.h b/aegisub/src/visual_tool_drag.h
index 03d6f59e1..25f363153 100644
--- a/aegisub/src/visual_tool_drag.h
+++ b/aegisub/src/visual_tool_drag.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_drag.h
 /// @see visual_tool_drag.cpp
diff --git a/aegisub/src/visual_tool_rotatexy.cpp b/aegisub/src/visual_tool_rotatexy.cpp
index e3f9cfd5f..25a82208c 100644
--- a/aegisub/src/visual_tool_rotatexy.cpp
+++ b/aegisub/src/visual_tool_rotatexy.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_rotatexy.cpp
 /// @brief 3D rotation in X/Y axes visual typesetting tool
diff --git a/aegisub/src/visual_tool_rotatexy.h b/aegisub/src/visual_tool_rotatexy.h
index f64ff95f2..1a93c6279 100644
--- a/aegisub/src/visual_tool_rotatexy.h
+++ b/aegisub/src/visual_tool_rotatexy.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_rotatexy.h
 /// @see visual_tool_rotatexy.cpp
diff --git a/aegisub/src/visual_tool_rotatez.cpp b/aegisub/src/visual_tool_rotatez.cpp
index 551bf930b..c539f6fca 100644
--- a/aegisub/src/visual_tool_rotatez.cpp
+++ b/aegisub/src/visual_tool_rotatez.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_rotatez.cpp
 /// @brief 2D rotation in Z axis visual typesetting tool
diff --git a/aegisub/src/visual_tool_rotatez.h b/aegisub/src/visual_tool_rotatez.h
index b23cdee2c..08cddea84 100644
--- a/aegisub/src/visual_tool_rotatez.h
+++ b/aegisub/src/visual_tool_rotatez.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_rotatez.h
 /// @see visual_tool_rotatez.cpp
diff --git a/aegisub/src/visual_tool_scale.cpp b/aegisub/src/visual_tool_scale.cpp
index 118598ab8..5fe50d2f9 100644
--- a/aegisub/src/visual_tool_scale.cpp
+++ b/aegisub/src/visual_tool_scale.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_scale.cpp
 /// @brief X/Y scaling visual typesetting tool
diff --git a/aegisub/src/visual_tool_scale.h b/aegisub/src/visual_tool_scale.h
index 89da48b46..f9613b5ac 100644
--- a/aegisub/src/visual_tool_scale.h
+++ b/aegisub/src/visual_tool_scale.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_scale.h
 /// @see visual_tool_scale.cpp
diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp
index e8b280df3..5b8b67fa3 100644
--- a/aegisub/src/visual_tool_vector_clip.cpp
+++ b/aegisub/src/visual_tool_vector_clip.cpp
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_vector_clip.cpp
 /// @brief Vector clipping visual typesetting tool
diff --git a/aegisub/src/visual_tool_vector_clip.h b/aegisub/src/visual_tool_vector_clip.h
index 0d21ca20d..3657e5cc3 100644
--- a/aegisub/src/visual_tool_vector_clip.h
+++ b/aegisub/src/visual_tool_vector_clip.h
@@ -13,8 +13,6 @@
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 // Aegisub Project http://www.aegisub.org/
-//
-// $Id$
 
 /// @file visual_tool_vector_clip.h
 /// @see visual_tool_vector_clip.cpp