diff --git a/aegisub/automation/autoload/clean-info.lua b/aegisub/automation/autoload/clean-info.lua
index f28dfa1826a245d14401e0292215a40063f5016e..4cf0fdd7885c8b235a928df56232c15cf9f0a1f3 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 35bb38bcea81277f92faff2a395c185efe870352..e6bf44f791b1229153447db2ce3868f520809e32 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 4e0f9f92d9e26374dd1c18aa887bc501c61b881c..ffe1b90d18b2749d210dde44fd51732dd369d3fc 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 55588d7b14b44e11563acba9f75cc4cf870a1e22..5033add1be806976773beae1661b3149244b3a63 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 47f55d4906ca7a4c090a9bb9177d07296d406613..1de7aa7e38a7bd98c12e9ea01b3cb10c1a56f480 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 73164979171964655d6db2ff6290bde4fd481b9c..ff397da52905a2581c9d3f0cc9d6ce4ca7d6f559 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 83c80b97a3f48accca5c7df956b5466695145f5c..4c7024859eead1af40d059559c76e36bf5149947 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 d86396e4091eb11cb978782d3f6a424147d6a171..3120a54c5d158c7eb1344a181c7e56aa8bfb567b 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 60e9594c9fda5308a2d934e8600dbbf1b7e0dfc4..b485404f10baa15ab52488f9680b019832886494 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 566312c3d1a82ca58fead4a3ba5badbecfc00dcd..6ec90b48916ca97b42850bf673ad8a87cace1787 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 aae10bc4a554c446762588f45d2609e231959380..c2a533f15bc32833e844e9d6de745983bb0dd939 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 98e1ed832384b16e2efc209df1f2cf7071b3aecb..ed7c92825eccc8699fce1010b0393173ecb99556 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 2bea180e367190db331c89dd3113acd648967eda..a40efe78389349c8f1d79151994327ae9e7d128f 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 73a28f2e23bc231a161380578f9a2fce05cb0f4a..8a1c27f13e10b90ca49002c19326b56015d5f276 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 abd98ea5b2f61b981f17859ca2cd101bf17c2f01..24e9f7702355dcf090ce48da4ee70a99817fdaa0 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 daafda2efd53d46f9b3af015feb232d9755e8eb4..da92272bba286ee3ac933e3b166fd6010e9a0f27 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 d76701342bb7df1e609bc4ba21762a679051a9fc..c6917c4c17666688add725790384a36dd31a7203 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 77f4770606c037c084949935686c1727aa35771f..fd89ceeb2082c4c59e22b54ea43b6827b2c8fd5e 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 f3b84c681d2164c668e46e13a3ddbc3b42dce032..21e52fb9ee68863b45ef98b97c1d77ec0bedb3ad 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 9438962042c3b1b555c2617980a418ca57b7072e..82d8a56934fecc3a6adb2fb1381fc5a3ebb4a8d9 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 8359a3db798fea6ae4acfb5efcf3d360f98f35e5..50127d620e2bdbf9e03996d44915cc8c25e3e77f 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 355a5d735f353769f5bbc9cd4c437253f045c243..ee345536a7263088e30912da21d1cf7c1d1a3280 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 05bcd684eed0a5f670a3fb22a45130961461fd17..a92dee04baa745e0dafabe74462c8e2a4dbde104 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 1ef9c720099f87a94198c6cb231a67bebd690f9a..ee5ecb01ef740463a7128b577786df2bc8b09553 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 7ae72e886ee8dbb7bbf77ca9293a25b8da61af4f..2f009aca80f4eb78c0c2474587de3b3551ab767a 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 e41cd8da40f51ed9617c6ee81efda765046900a0..a1c652c856dc09c93eac083dd75b87ec422c2d9b 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 f19f968d74ac2af6d50b469739d82662c2abd977..b95b6aff2a26168206e4c4e8f04518bec351d5d0 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 00dda53225b5e2f5fadd804d3cbf346e3091d4eb..f7551daa9fee332138a6d9486fc2a2d1a467b338 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 fc35eeb5ea9fb3ad2099459bbbeb18f7ca2ec0f5..905e92f0796b9abb5c84a48a04052fc00aee75e6 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 b6b28b355f66e8922c3bdcfb9053f008cfa14f5c..9d8e07efe172fa7616f45029ffa782b6e8f29673 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 416f6938fa81648b8e9c1f5c6d89bfdff92a5f33..ac1c75e4fa4598f24632f7ec14155c950c9626ba 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 bd363f2e48d6b650ac37d8d9c25787d4b95408f9..c7bb01ac4e81c622337810699abc5f5f23449e63 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 54224270a152b781daaededd9be976ba99e554b1..04adc8d2235d101dbcdffdba103fa0b7fe063af0 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 0b28b828b9599f3952593ee78e45b2b6a0ef81ab..6737ff2a68f259e5b44fc981d144b9ec8c4c6b61 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 425f3af97b153f7fc599d753c771a17cb26a13c3..44fe62f967271c772821572a3e622cc78c6db950 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 76ed31e8b36de428af78ee06110452c511d121a9..8d007231a7fbca910762bbb01e4ccfb9f775bff3 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 7dbbd836d4557713eaa62e790185545d612d1e9c..d732e69261f18b419db85cf2903d188efa02c0fd 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 5ebfa970f828d86e959353d076a3ce22c90ffbdd..3632cfc625f28c420c28294d62cf2b79616c4d44 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 ea4c7ac8134e6bb24982b73365b51c6067199050..678024697986b49a360fe6332471c453e59bd894 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 e767a0932b29d11b86e607f2d08a95351cc63b9a..6af3294f9ff8b2a2cbde5478bc7f3ed0f6d8be64 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 645c981a38b4fdd98846ff3cb7a7f7bd17065a84..2b767a666691e4ee61899a3510526085bb365284 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 813bd7ec3a28d657a27b2a9e2e844871e61d1d52..eaeafb3e508668fe47688c529236cf18abc9481c 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 8a7758f56c49effe62cde34991952416eb37047c..213b743b0b8b9fe69ded70dce3b30b6981e6e90d 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 d9a8f55bbee627ce08150e15ba260d0ae5a4ef29..edaf28c70a7bc76b610348758b9346358dce05b1 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 931313df04a0486c98fc3f83325b42c6d05196a2..96cfec756ded38b3e45dcdbf10d95a06acbee285 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 ed7eac4c1ed8ea3e37c47cf4e6e8ea9652dad082..7527ed9a54c80b1908bd869ac19d932a61639dd6 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 aea19ebe3d0f98a2c3c360d02b2bb488114e681a..20683c8231926d9a79d6d1f18199465374f18303 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 be1031c7f3dca048ff674198e5b49894e56e293b..4bc5298bcb53cb4ec4f3cd9dc72b456cec6f0cd9 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 01164033d47df42b68362d1eff839c5c9eea53c9..9ed4f6274a83b043050ae9d7704132bf1ecf83b7 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 88eae8e9e1dae2366478952c1a6506c32bffb2e2..f201f3cc21d631fbbf4ddaa29b2e570c67a9dd4d 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 f7cd450dd2fc967000d7840a9441b633c03b4b0d..6435653bcd7d2e754da9aaaf14a99289ece96173 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 3b831644b1c28e2a51b0786c71a089df7b020f21..8fbbbece68144d2d042344e64cccd0db4a93460a 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 2136092e19a77ef9640f3e502b4d2676773b13b7..38ab15cd210dfaeccab4870e5a8b9bab31bc3112 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 e71c54ba7be3d80753ff9c01a39d1eb28c8e81fb..ebfe9340dfff1c6ba76e397827eb34df213f1f4b 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 82c20eedd356eb357124d68707aaddf5869b4fd2..a98810660268a36cca48a8b7acacb2812862d3d5 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 158a45dca3299a82dcbe98b805792d88c006a88e..2c84d1b118c14bee4e49350a9cf9867e31714af9 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 84c2e2e2d8712e2299e4a85d2dd5b430c6580ea2..6942423dc9337ef3654d2109825c65eb9cce0502 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 61eb8da1c7807a4d6e4c719d1e134d05fe3cae8f..0d620eeca4272703358ec9738efc63a4c07ce15e 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 a5f1f7835c5e869bd4d1499117afdfbe7ce0e29a..2910d96ce97f1b8c2ab3e1d3beefdc2e5982ec9e 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 c9074866a05c40b362c760cd4dacf42ba48cd71a..e8a64cf632e9bba2709459589febc48214c5a31d 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 1bc6fea6bc322d325d38b71db209ddeeb35ab9ac..0d3b6c295c7c87b63cc2199b4a91bacc6df50d49 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 c3963fc9461fd0b30b18fab4ac6e8067cb3c8c91..01281c182f7152f1ca1da6d9f9d01b4e729f9e58 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 06514f436833d0b8b5a855015f64cb8681d52247..f056e1c704803b8446d320ca6e7bd70a342d5839 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 3d9ee49877979ea880bc74cc13729c0d6ede8ea4..a79a0fd08f97858d816a4173b1f01e08715fb4e8 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 96b7688cc0a0196813b113bef015ac19f39ce759..d951feb0e4fcd2410a25f0689c1cedb7f6ed2ce2 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 04d14dd8494e6e3aef10f3d27b3487a679969b63..01902bb2f26c2b0f6782a955fa4e3c349f0c2aab 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 f13accdf0aae92084195a94d764ee9c5a3fb4ba8..728173d01e328fe798fbe816a2edaef3c0e91c8e 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 5200996e6ababb2cdc4289883b259c9ba3fd5d03..b9e63c7199ab7727b0b62a5c615a6f832dd76a67 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 8514fc9f0ea28f71ea2a3550a4563e1dd1b26a05..1f9b6c9f5da974658e027f4e6415461f36101e4a 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 093bd6bc547bec204f338c115ef1d8da100b69c6..32f1df6c004f410426ea4f5e8fd7ca6920425192 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 5b51c54696ca84eedbd499c06343250d6b066e8e..e4832a36aee7ae952e457b0b9585b008f7739641 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 286001bb514be6c4e61b4972a0cddc24c3dd0d86..fe16e9a562bb03fcef05f761a95e734777ce7692 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 0d5310569cffd8783b170a0825107af6182aec76..36197a131ce9969d30e95ea472543d81b51bc48e 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 948fcf24fd15d128bb9ca51b8a9583741640751a..736883730415c021803877d069c0db5a54e65089 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 fd5084905c3b9c3c34ed81fb2b17caf642ebcc53..00300d41740cf9c18e81925ba7377e714590706e 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 a59b860de42bf5070b2465f464100c7aaf3b4168..4e90450efbf417622df36d3150ab5b9ceed47a2a 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 016160af4c2764ee18be2542146d0f88cf8af7d2..a30e65a5c7442b28ea0480c1f398f2efcc8600f6 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 5f23bf7c276d982952fd4c4f3c6048362eeae558..2818cb97808232672c772749d0b6eb40413de5b7 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 4c8902cb8be5cdcb57008c889135edcd0e87cc0c..6ec3f873a4101cc8018cc0d97b5021b3886ae452 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 8f1de7d780604e9678906f0e0d953d2b129d9b53..430896385f10cc24aa17f3a768e5167e11d981c5 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 b2225fd3a3e36f2c3df68d46d196527b63c836d8..fe5d15e65059dd294f0c7f3ff673b803b6aa49ef 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 59fa0f7bc5b9dcbc4c07a4b5d61f78bc240a9289..a494dd1ee81cd722c5ff83caef70e9c5286e0f19 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 e9b98e6beeac756bbdb562d1ea57d9234e44a3bf..2149630ee4955c481d5cdfa9dd72c66d1c761aa2 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 688f9364f32ba274b4401ba983287f1f764ed984..972425285ba3a4b85df86b38753311977225991c 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 99057ef68dbbac39dd822fe35a5ef1d4483afd59..c823db56702285137b16a4efac1cd063090d77cf 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 669a6e7463e7900724cd650b6b4603e2087e124f..341beceb9f21bbee2062203f2e6d38947d8faf37 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 a413e4a841d3da96749283e7e9ce622b00296d67..5c3f2227d7219897fbe66d2daf06e50bcd2ef7a6 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 7dd9fd7348b1cc90df59b0137412f661a3f811d3..b5339ce1bdb0c7ebd25f85addad823258578a527 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 3ca5ffc6c2584d7351d555db754f294bc462eadf..7180c9a04a8f32fa3c5866ecf614b2938b5f48da 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 6f6d027898e2cf7d39c69e1bc5b2fdcce74f39c3..237ae346954ebe2a2b673cbef47e7646330c7f82 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 567ae44ba80813831b27d9127ed6460f4b6e43c2..a0377ac011ff134a219b294ace5d4d3a0b87fb3d 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 3ec17a934def80fabd8d9e9744995277b9f5d968..4bc6d30a32b894643bdf914df88d9e78c2304bc6 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 54c55dc5572628181f97d71041fe3f997291dff2..325449a66ab466cba7f591c99476cdbac519e8db 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 486ae2e3f0b74bc310d47bf06b7b99417fcaf28b..12859c82963874bcff0339ae2ad7f6f401661826 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 c0011605314fe1793b86629098a115db8ca9fb79..9f92301d6052c7daf0df6dcd5ecc5a25f8e5ae9d 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 1e512e932c6658dbf9a81e2f3d6b36a2e22079d9..c21b7ae5a384a1b441f94f2f09e94f743d61de43 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 a33fa9015b625d4b757dfd40f03294b0a221ce1c..adc6b0cc44db775abe56eab18a8795a99edab819 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 e08af182d65947eb4a3b5cb2702b00f4e06e8f68..df4e139d22cf53b75af78131e8825ebca797adad 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 48fa445e35a731e0ab42a725a0caada725844787..bff1457c9a324837d0fcba8263fecc5759e6ad26 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 fff18a026ac3e7f80a36c887fcb119874f842566..454b1f8cd188fad21670fd25a180917f2f8bdd83 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 2fd3dcb0ac9c8e058e381104388bd4898c8979ef..69d073170938b042b6068eac8350f4946b2fb862 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 e4e47c20c1edaee8d01bae70e1b3e366cb0304a2..9a7b292e5730bd4ffeb25b125a87f8965d195ae4 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 8dcb02e40fb036b6f95049241c2f4f7378e926a6..2d6abfd94fcf83e2506dec99b9820f39a92584dc 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 b3089c12fe3d2fc4394ab700e7b55775e637dd43..3b6e6e92c13740b8028d637108379475b6ed6e35 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 3f306481cb39d39c49a4cafb005590a6f7d2428f..df8f09358b933ddc910c483b11dcc1b85c79d57c 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 63fbb65ba1ec2c5910bf0a1c74d7ef8b9241253a..a314d4f09d6a3856701ad0050bb07a095edccc3c 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 afa0296d98fc0be339214c90596c8288ca278f66..42cfe0e6694b015a99a40da7952c50a833863a2d 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 d81d6ecfd006b41adafca58ea034a9640a78b95e..edd1c6717ca031c19ebbbe575c10ec2a9b5d7b93 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 dcb64afc5bbcf21d6c3ca24a761e944fb9bd7847..4f75c35cda2e119de75073ee7e5ae9f82bffd53c 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 cbfe9e6fdb5ad8abd4571932d3c94c5777abac62..9b8494bbb11251e491574863cc4b530b5356c615 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 4d1bad04d42ddbd4d8b980fb3f2325e6b6794fc0..9ce93c0e3ef8db243fb533b2001297bafb15971d 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 1482a56d6124fd4ac0f7b8ec482a10cf78adffb8..e5b8eb6fee888f8bf99ab9286360a8f3478f52f1 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 51531137d1c377c75e63beb51b2e09c9c90cf401..4674d587a8ff50581a1b2af8e02cf955bae4d0ec 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 d2ebd7a3b7a1aedb1a1b5578632671243abbe4ed..bd8906b71bcc59290f28992414e3a48e9ebfdbeb 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 bddca3350a74fa6cca1055481821f4c641be051a..4c945c2fadf8784008ea115453c7d50fca97e2a2 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 b458a5e11a91f06fd05e4bc2bebd273997de5229..6ae666d4502dd3c0d16f8b05a8e9f23a06c39aa1 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 de9a0241bea27bb2c23a52fabd9cb1fbab2db3cc..229b6b4e5a36494300d8b577837bba3d8fee7dad 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 8e5b62dc8ac21e7ab08585556c13027138bdfc03..b1a57ffd64c11ec662e8e3f57f9b861799eb0b42 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 48e425409b79911a1c71ccb6d777720dbbe63feb..bbf9ae92b39dc438ec94ba08cddc1de305e69fe0 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 0c85dc558e0229f0e256e35fcfb527286f004368..73fef6b345a749e2095990865f6089f84c1fd71e 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 072b6ab02846343ae8f202b951577cdd79b0fce6..9b0279ea858ae28b1c58fdcbcca97062a74768e4 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 1ada9a80a97f19d4eec8c581297d1ad4e5992829..0b96c9073fbfae3fba82452c380caffbd5849ea4 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 b44cabf5bafd82804aa8e6a01e36f1c9939ca32b..12e948d13da9397be64a6d0e10ad58719c04990e 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 98b82b6c96dd9b81228b9c02a893c2e416ce868e..d879e7a5a512871cb58a0bfb45d42439d5c430f3 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 d9c141d106d158c031e93f0a62e25ed87a3815e8..52e1577dace6c6d2cfb09d14c91ea5fdef2d2b51 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 3d3def4de93538d9b970607ebc010470a7f0647b..0db367ea5ea80e03f4e963f1778a0a128418a502 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 f6e575f9435cf118809a281b3407a3cce086f3bc..810ac593fdd1a1cb4a86d84ac3ea3a2fe4f075eb 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 f8bbbf0262f74b9710ec76397133705e6f6231a0..190d9f4e7c59e447a30a320937c1e9fd92c50e63 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 710394b2cf805df110183ae78f09037cbb3f9a59..dbe9f6efe9851180917db9ea7f6303a33b36f980 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 dec7a8d8690309909682cb4ab7e458def306ac99..d5c054e5e2e1f3f48bb6b7553378561ba7c4b841 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 d14f17d44b539a0a0d4e60783c30ec3477b9dc2a..bafc12b9ad36cac178e9447754161c36fe145af4 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 55e14f7bb081a9bbf0fa7a6d7f3829e9b8e0d0b4..93df7aeb47bf28539b8b130f41964ac87b37b2ca 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 db575e3c5fb0ef31c0dd6c06b15c11429fd75e44..edf73674ab4b02bf4d4abc916bbbc757e47a4c61 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 ed930d4f84b9f3cdad3d4cb3df352794d10bfa94..4e3f62d06867b885c9542900a082a7d479207807 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 3e0875fb472ca3a5cf526471b52b0e8715504a48..312d98f24997108f99616285bdf09d89fdf68362 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 d2312c6b4e8097afef8e5512e76cb61bfc5bd510..17b8eea8a6406f67a5684a47c6dcb7d9cc667f8a 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 44feff0ec31f506a084a951f3913d630cf485db6..7e37d0255cde4f5b49b9a673dc86ac920bf21c9a 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 7ab4f05666407b572daef857bc763669e4542f55..12ceb031d9080424e2a23755a9b6e3804560301f 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 b563b0bf8c427f3b916568277b09c1bdb6a91fad..97a041cfc3c4d6b37f8102167f6484519be0fcda 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 4cd0651d31e45af15238cc50f8472910f6e01183..8d60e474723d89d5affad1014fe7572851115463 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 896abbafc8a3d8eba335c9551ff2fe32266636e3..4d111aa44ec153f282416aed953f75850d2cba64 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 98b7e54348994a3653a9dd35b0eca0cc6c2b7efd..6fc7e6b742b572d544034ed1d66c4fa46755712b 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 3d1d582d673a035118e08b8f3d9f2d60a2b211ea..cbf34bb2ae857093b48a599ae7227eab4cfa9962 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 08b2bf9dd0873c1b4a7078e4799cff3e19a01f42..292f93f77044fb0c7395621f8882bf7877b3605c 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 43dfc89f7656afcde848fe30e715796d5865fc1f..6f0848ef14dec48226b0359300330b02a3e02f4c 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 cf85ed980cae356006b4022ecd8fd350adc3d3fc..9f5923755ad2807b8f01842ae1a1754a9e5ddbb8 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 e7fcf0b38d979b101cca416b63772a70a020e841..ec3bfa9f66d9cf03d3a101d20132d18768595eee 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 2d12bf65e9506b4b3172fa4b8bd7335ae5ed3455..932ccb35db7cf5c0b80386aa9165b5dcb06e3cd5 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 e1207009512cbe7a4bf4b99418cc00084f2e9f43..f4b8a3092ce5802ba11490bc71559407da34dde5 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 ff3d6ce2db9f39420a3bfb898427de4835f079ed..48d1e2a7bf292f650f6b5e3e07eec9a526df58ad 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 b73990347d6c4935e9ed2507d99299e225c24a13..6a942c6eda0611b61e2dde3a7df25623f94acd5c 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 6e8c4bdca146494ef6fb86ceceff01262e91d025..d6d1d6ce3fb407f23955b174b7c60ca5b93dcf25 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 222ea68cf003104723852a18bbdf4295c98297bf..52e7c02636e88e2628c4bc6a3711d35a63ce8bff 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 839eb5e20bcc38272e9d2a07f7a58fc5c8120cf8..65b5f5a28ec9f6ca47c6149666e9c1484612f402 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 6ef22a164f42e2fdc10ab7e48ac825d63fe6187a..d312291301c1357ca60f74a146a21c3aca60f583 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 8c3284e45275951631891eebbead220ca2a56606..24c85df4f4e60953342b3709277688e2ebc22c33 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 a3d1c384ab93f53865b2c078a4d955eb1c2c4d25..0307245ae5c07679144da5b7a899ee90ce184137 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 4beda78a04aeb547e1690baa811d97ab1e0d0f7c..408c1a98761a4cfe30e4e13f18b5b27e217c605d 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 a06e919eac9bc6f09e3286b06d6d501dc521948c..1fb87a4c464267fa94e593aeeee3d37aa6b9de42 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 f2c0e18dcf564ab7d31276cad31ce3a8a5e7f388..e9d0f35832abafd31166ae0ad09c4dad7447e25b 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 f402ed114fcbb26f5b58c4895028f2a91b21c463..73584e8924e428d6122e0b5237bc5d568de2c973 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 0236f852a3d5669aa77c4d015867df697bbfff15..51de63999c648d73434809788b121478917fe959 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 6d8bee17796c940a222b133bcc0c7f1ff041ef5c..507d96be547369c80f180991ecc91f364123ec13 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 1e8eba4e5a3fed242e61539c2416e3963119f3d6..4bda9b8c318a3bb34f3ecd3b63cec779182dd5a9 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 6dbc8b05e646d09eb01f72d774ed2c7022390017..19c52dae08b74eae65aca6b373509815075e361a 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 d3966b2401d1f499ee9c6dc7ff0b5180eb37d7ff..1f0046d2e7deddcc443c4111e2896430c0b4a1a2 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 e23f6ae15b3367f962a54c7afe73af74a651c349..29016246a642f93ee16fab4faf8186bcd9a10565 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 8a96b1f7a95dbede295b48e34e49e341c3d4d814..f77bb377a04b6cb55d75f553911b9d58911ae24a 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 6f6c88b2c67fcf484cccdc1585437418ea276b16..e62c97d9c7cdbbb68f44fd333199978995afe431 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 1ceb74d4eb37b3452f99ed251abc6bc4c4c1aa54..5cc1dbc7087f63f2fa24c188aab7ad84a6a8ad43 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 327636f3869b0c27ef45efa0f253a26c3629651a..b9ea97abbc136d33e14fbb42a7ef85095e38fed5 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 e8864e1f6514290bc97e38c902f0d90d7d0602c3..a8e7c771766e2a39978419d96c79b16851c96356 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 ceb1390a6620068f8552df3643a70b6e1df5693a..57fec5893096b0cf0bfc90176d69df8db122f813 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 98ef0d286108662bd4fdeb9580f2b636339fbe30..253660532a2f820b89b5178782b9cf6ee12e9161 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 1ee397385a903b5cb5c32b3dcf03190f268c1174..d18be7d14f405d5b6add811b91d504a3a96c7e99 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 6cdef2140d16d9781b98e5b4a72188247737178b..5a39ae674a049f85b14b6bbadb8e299a147b931b 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 5665b254fced272153b786352dff8a3440ee2e65..44f7140089f318dd7b2265836f47a03ead1aadf9 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 fd34d8ef179ab8a370c0422c111d5fffc9d49da1..84eeec4b339f61471fdcdd8f5e9bc16a0eb7007a 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 4d0e9f66dd5ae32382698d91421d548bc6978d5c..64cb8dc9a5249344f23d187fda1a726752b591bc 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 7ffdbf3d992560288a86dba5aa0f8fc9589f19b9..693a94ed94831770f10e46a9ff4c8b5f0bacf36d 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 65c8398401007463bef15f69c217c5b930829ee2..c897c0b45349a14d29adeac135f653dd51885bfa 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 9a1bfdee2dd023792b1226345f5120e9d1450a44..183c6593c7b58d5f025bc4bcf6a13b478c5944da 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 444685d8dca9cecbcde571951758920cdf8cbaf6..23719841055736620d9f6451078d78ec8fde9b55 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 99ef3792d674ac929f0e9a04540f776533d2fe00..ac44d40587766b2cf222d244376a05129c2b73eb 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 b12b9c8ed61577b42ae17db0de71bdb7af69cbd9..f93d001061387452d5c004a1a4a09dcec6515d53 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 607045aa7fbb54c1b6460e9bb7ce6512b7fc9ea8..e14487e9bff851b737311c1667e9350c977e52ab 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 91cf250f5a4d13e877ec489cc2b9859fdef0fb9c..95eb6b1e08fc4381bf020bb60804c69c3aef2135 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 d0060821b71aada0d67abf99381986551dc0e230..c6af177f2f3282608f2b04788548f1b831d929ea 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 0572b730e35b7a1d3dfc76e8c19199a5f8d693ca..aa389c479228d10ca3dd7cd03cd1003533de1934 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 52ce3709fb764690d6c1027585c4b65d701b6d44..bda612458c563c0b0b70900a006913dac8b746ff 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 432206dc97116ceba44a4586de177361a1460eec..827f5f52713b75d171ec0ceb107d71874a0bf2a2 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 ab86d652e3bfc2def51a3b5e8f6813b8163b0895..07e9a22d36472b1f428ec0e47d29220e51aa9002 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 4a78239f275e2deb09c40a55f9cc032099d04e64..79644f2cb6d3530f8304a4c2021ccd5b12ff633b 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 1b1c4f39a147517c6892b7e0577a89b6d8085efc..8b5f5f7f98d45a8ad376ff49599e9971fcdc7842 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 5437b8d14560668de3c71db8f3cd12b92c09fd52..95b24cc918de9503d650d2558401d1efdba07a48 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 83b70a3dad7ac2918468c1657dd558d9d8a37f3b..5b3e351d1649938626b5184105cc42fb52665181 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 635eedef7b54276261f920eb812d5dcc096df749..4208f603a3c297c833c25eaa6e45016bf6d73364 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 f380235cfd09d2a3f163de0cc18043ee37ff4d6b..d7537a54381d27f1e6fbff671f97fa10350c1db8 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 a256d3abec9fc89b6398f73073e5346088f65723..e50f6fcb9898e0a62095e43571317821779ad186 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 49008f441d715be7c20e375f2280f10a01d48c63..ecbbf6c417d1cd2ff420cbbc43c8b12dab4af951 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 6cfb2f0a117b39f1bbe7b8571b58d3c5afb9ae3f..826b1caf6823bc85c939a0e079009ff82cce9f3c 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 6055fd277b5d6607669d454858532f32a87f329f..a4a5ea8e9c20bd6fb2fa74899a9ea0bea3f6285f 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 f8b873ec89ddc5abfe8b9466b6ce6007abe5b3a6..e85b6e60879f351ce333e0f69275701e63c8022f 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 110112a2660bc4f94fe8c1c877fa8729d863292e..d4025456717f93c6acce250a5db49cc13b9e3d96 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 c51b8061b8a81c57753fde248c26d35b748abc4a..af65a373b0f4ca10492e9971d44b73b20fc4a8d5 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 649e92c361251b63276f0c31bb78b0922fbd50a5..0db73855dec13d964954903ab5c3399dee8d7f38 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 4cf6ac4bfda5e031501c006d084defa99f90c0a8..a08c5579366bd5657d2cde5a82e301ba6b481a74 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 b6759e68a26a3e6944ba40fb2821484267276c68..cff7a141040c03dc5e8f4c5f557ddbba599d597b 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 6307bd2d37bd3b07346cd96dfe81f18f94d51bda..ae64333d08634622c5bc4b874a5975c2aefda44c 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 4be62afd03702571d108451cc2ff0c107fa575b7..aa5eaf47bfb919af942baf9662385d90246cea2d 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 e4d9e94d499ca5781db63761b5c3f9ec15889345..4116c7c36bbdc78059598aa2269c73cecb81820d 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 32ac451ea53e3b36d92012bf82f93a28987155c4..5c689f53c236801ddc26f3db7e283632a8f6e0fb 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 d1d993f4a9f07531d75c01396baac8bc9a981ec2..bd73cb72ddc48f472ca3913d32fa7b58681c561a 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 c79e87a44ed62eb067c66ea2cb35104a264d078e..fa6ded4ed99e679a9cac82d9494ea0ee619e6092 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 8ff57945dfd86e49bbd5a1813227d319fb306aab..6d8df393037a94e73397a2a1145847d61f673f26 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 572747d4972dec48e44a3e89fe704a1ee38a0ce6..b2b10a1ba64ee1372aa162a9797e938ad283379e 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 fc9ee4a15368e7090c76e078ebf443e10ceb313e..57ad08fcbe686d20fa62a7d6af9b22752433d423 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 40f64442ccaa5e08b062b0c352a79370a13216a2..b6f6fd6e2ec00d4d294465032542836637117e6e 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 3f98f639a5cd21fda19ea0c25ca9c96f1c851bbc..652c4baacdadeae9560d996ed5f44c9c078aeaa3 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 bcd00fa6c4ad97fcae2afd7c4b7dc55a0781203a..1654ea753168e058b46d9fadd8680c31c836e27a 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 67fc3a0d32828e426cac744be2bccede961d2727..a96bd3fbde02e76692b457aedf7b49762b690c05 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 e1587b24bc8b08d0f8d889997feb0cb89cc02cd5..e5264c811c29efaf9404240f5c6a989f881ea299 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 29fa8ad729ae6ef37340573045dbcf769dba84b4..eddf889006e88d058670f52119bdd74ddd8fed46 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 2b5aa39acc3ec578c9f36b96f3836a03dcbe22ea..b16817d6c65236605b7191de892edc52eaa5cd14 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 99efa36fda9694c05764184f8c4d75a355a3c996..1ef3ca764487993f12f4986fda33b542e80e5e66 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 52a8502fca4cca620a0f19d8abecfbdcee226071..4458a128b0cdfae24e2cbff22fcd48154ee2adf5 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 4ca9a0e201d63bc29d2de62c1c55a9ebc2bfab4b..d928ece33f308d256b9a619353636100dafeb76f 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 018ade74f4516e2806e7e0ab63a6ea253f8960b6..cd231ba135adcc5581901fb48ac90a37b81a6ab0 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 cddd1dc43d4abe6f6a7f4b5e210ec92e8717d58f..27bbfe6effb95c42c43026d5ac8c707a438da155 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 62d4aefc0c5b581e300baddf3498720fa18d09ed..cbf9beb0715eab5d7567fbaed58f9741f15d58da 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 c8e8a5113f6129bc551b7595a8b311439adc9ac1..a4341a3a58224fe2b0f49bd26b1b847ce3b566e7 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 82bea8d1bd48255443b7624bd4cb0c77cd24fb35..8d2d9773c7e55e667d3f23fea9ff243032e923c8 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 ca861d08639681ac52c6c0e3d98e971131ae2063..3155fead614dea710c99d5cbf23121430d4bc19f 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 903f16ff8c89e5eb6d909464e0e7c8764f18f659..4847881375cce6b5823b162469171f4ef09a7f22 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 d46b65d19665c301fc4bc9d5ab153dbc6d6da27d..6e3c5be7e1444a63b4eec23b897e9078f1c8a601 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 d0a44a6f12d35709b89167f2e019774d99709b31..67077292f099d9def7c3b1dd4192572af869bd8a 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 4160397b028b44c50ee3fde46a87ca0ba35fdcce..9716db10cc5aa43c97f458cd259f000b206ca2af 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 d29c7bff15aeb890d81d1c57fedf74585ec5b08c..472fc45b6dbcacd10ac5fdd241b3fe418db0861e 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 3b9698c08b1b1d0e4483009826912c521c740cbb..f31e6008090da225ea8839b7a66c4c37ba077fc0 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 6a3dfc88b62c6c25615388c19caa727e4aab921a..e24471744babcc1ef7090c353aaf1f1a3876e6c6 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 23016c93b1aa8c8f7d9e290eca9a63e873906410..96bf6e14458fa27ba14ef2789b81f65a04b6ba15 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 d8eb77f18efb19d6686475c060af07814a9815b4..f3be7ddbd1c4c0194aab62dbd2417989f54079df 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 52148f46746e8abde70b4848241c6f3231ee10a3..5cafcfb668655ed9d271a951303831f15c9060c9 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 cfa84e4f2010636665d8fa20b6b1c98fe9193c9d..74403e2982aea06a746af6868476173ce5be6933 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 657d56fff66c73b77cc0b70079e15a45ce27318e..ac321ef7eeb148028ddd20eb76b8abd9428f1fa8 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 6124d92ca455da79cee688a8fb728012fb79667a..812a773621626f6179022fbe87f352b7612ea631 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 195ac44b86086997830cfb5845dee5647e3618ab..181bf61da0471b8416c340fd0334e29db4f53851 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 a9399757b7727aae3e669be1e74dc19e19a9c1e1..7449e8b83310129134db0fce5879693adb94aa8c 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 ee490c78614b2ac465b2a496c392dd0ee27ad587..37e4f4f356fe03f3ae4cfd5fe9eb906cab01717e 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 7df85fc33e943eeee6888d011d3a6de638be8bb3..6ac59aa903a2917c8d29ee40a8740890512cbd36 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 6300cf42fec70e91e46f4436e35883bb2bb96808..a8bb5ea33bdbae64ee62d513a0d507a1a3f644b8 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 ff243332d5e6ca85bb5a1942d329db1bf968eb59..2a2b4e89d0596da3ec0c3668a9a00d26a78a2b4c 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 3ae7d98011ab462c28a7fbd07460f9849b5b89e6..5a230fd7f402589c95e928dd63af52ccd51f6225 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 d162d7cc64343ddec0282e6f9d05be6fd753d3b4..a693e9d857c910c01be573d0e74d3ed5e237c774 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 d6d28e8f39301a9ed3a6ea7186af131c5ad47ec3..aaba6b93356b1e0d8ab2ec7c00cba30f53bf9d07 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 1dcb26f052d2228404d19738ad89dc815f7d5202..66a8ac51bb4086a936eaab9eac6c31d48c4ca4b1 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 980d4a2b602380d4fa403fe4b8af2f10a66bd439..e9513782a84f8580940feafa83c56bdd0ab2b426 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 c9b635dae444c912235f6c9d38aa0cdeab7d3e8a..1eea5e441cc073e861e6a5d67ed31a6574614041 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 0e920ed5784eb210317cd39efed2c170a4579c65..fa37e20428fad3a6b31afeb4cd7d86097165b9d7 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 e69635cca0736fceddcf90c60d18dcafe31fce0d..ec1b7ada0f2d04dfc5e790181b8918b6a1740471 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 50b9a8f7ad2f3b72b7a417e55103d06d9d26aea3..60f4279f913bf7b8de0a6c120b616a83a3ee04c7 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 e39fdc9185d6e8be0fae37d8603f3e60a8322612..417fadc282dabd11cae8064a2b4c6c4cbe864c07 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 fa7e6719166a5c276a8178bb2abbcac1fb8d615a..ceb5ba0afdf8145539be6ea8c52e6ffe94b258f3 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 c6c9d342501409f529275c911f6d0359a56ddff0..395c98a5cf77e6130cf46575bb6ddeb1ec3f37aa 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 0760819ea5cf560b5099ba4d73b7e11980840fc2..3c7b6e61a0bf3432f7ab5e7676db824fb54bf19e 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 709594b3b7f7f5b5080b92db8568064b7b895058..d06d06c0d8832b4e55d140547896fa874cd9a0df 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 4bff02b449682bbbd86de59ff2be44dfbb91f5fc..ff3c3c1f79622959b365e2079521cec69382f8a9 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 c1259b36f1e3d7310a4ce200208724c84271f679..1d3749eb9037c2a8dd41053a0b13f3ce1be919c3 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 d6981cd5b1ceead3cdbd8c14cce438906057e886..9fbd0e9f99d4031dc8d5647e99fcc83831d99c11 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 e24db4fad9840e494e4dcaceb021fbf1e07f1c64..a05df5a0c33f49a088147626629cac298b1dfec4 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 3df7b12d393cd7f4099954bb831ea8167e489917..4aad3d1d534b617c880e694df60bd7120012930d 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 b13fd3068d2d86cd338df6a6e7007dfe32b06c7b..32653b0e2ccc6564072e2560dee5be619e4b9636 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 d5c3657feba47c07b253504d0fd6c63751b27946..8b868c2f4bdf724d6c6d56c4cc2cf21d48354e72 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 3a1ca85c04bf796393326bf8379df2e4f40499cb..3b6eb6770d190386ae60e9b91381aaf8368cc49f 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 7f6800fe8b13690d45ccf6414aaa595413fb1ba8..c2ca514b1555465976e1b6772a71978fc4739af2 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 1062f7f28d8d3f1135fd242a77c372d77ab77338..be71400e6b73f7768389b2281f5c1c7914d9b9a6 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 df804826b353c7da7ca5e1e46e1b228d67853705..e99f3ecca7898cdec36fd3d70bce0dbf759b0eb9 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 362841f01e4c04f9c19def03759cbf6a6c2f3931..430cb32d85c0a353d4e7e50de93bb7c6f21bfd8f 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 58da817929fae51a8e07c43e07d946b14bfb370c..35ea2b77c9a2563299a6fb7efa50ab7201872ce9 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 2530ab19f804628ff42b0e32ecae3f90b79c7c2d..57b6a85667fe30c128271fb20038d408b44eaa6b 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 8134d51d92a249def101a241c5d7274dc6a4e832..b521602707c8ae2097b5ca19855ef349c4150316 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 9082ab9569fbeec4cafa989238c368f8366f78be..14dbeb3db5e42eea3404ea527a7f05e3fc218303 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 2ede66338c6f1dc5cfa2db6515e883446f733daf..3a17c4285a7d75b9caa1889ba6c6136b35057cc0 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 b8a7e8e8915c46802875325276f2830d6a78a522..84d579b847f06d9e87595b4aa0c7044f67da761f 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 e9f84d5a2cebcf627fbc73c48a0c33958931305b..f433f6640fa95210c8692f61955ae1cb70dda8d4 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 f6c068727d063c3338923d15d133d4f397dee275..a88ade6e0d704a8eeebe19b95a9bae889440c2a6 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 952e08a87ab7eb4378b735733c5b8274e280ab73..fa30ecba953e547d98cd20b11003e6af99dbfd84 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 db55741aa76f227ed2e568b9704db9150e28de0b..3144b68bbed3ed06f5c3dd1a8decb57c241f4697 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 9ac746fa61375f476198ddaec425a7244290ccec..4f77d0191816d7800e80bcae7bd0010a7979b5ee 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 851cdbf95b6c9538618191d5443e8321cd75ef3d..63d0be4740f99d7f919cd1db97d2e2aa5cc7815d 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 5dbc4a5d937e738b565e7882e3d06e61ee07d8fa..521b5771572d8790fb9daccdfac807a2a7124288 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 1e9de73f34be1843401bf376173c1e83b92e97a1..dce5b48b4ed59230ab6a5a22adaa792123ee693d 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 a664373d653a90708fcf504baa91a4179aa0f8ff..83bb765ef05d451223e65991f50267bb76bb256f 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 117ebb68408644ce5ac8186718bfb51c67f0a7f2..ee121517a7ab435ac1b1c4ff9710add7f5af95c8 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 e73cffaedf1b9a210ee6c5d1f314e63313c7595e..916dc9c25a80c8666c10488877f811dc905162af 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 ae510817dbc2995e814a863001bad6ed13e1d517..4538720183fea8ce4734bc47fceb0be818625330 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 df0be56a6ab47dbcd549098e8890bd8ad869108f..a8de07e25b78846714876cdbbee51b05b7b31300 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 aa3cff81fa328c7c38ae4f66ade04243e9bfb820..4d98968a4a339d3e29de85b1bfa7db3b1f5b0a94 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 4a3d75a1f17c122b44a616e461a57df32703afb5..3953f2cdaf15e51d4cf0b582b2eac98cf6283865 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 daeb768658c0f40e6680b3addb509656c9aa60b6..787e9b607f2bcc80ea50bce46ee89ec3db5f895b 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 08407513ad95a3aa19bc99fb9855d4ac75866b5c..0269583bc464401264180d338a3002cb20c272b2 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 c8b113c5173dba83d0127e8d8c90422013fc539a..9f7caa135188100c36419a13688965d8d69707db 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 6ecc2d3a3ea69af09297f482f602b84abd3858af..04921aac26817fd7075ce00d0de6a73e1d43d321 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 d342eb4e1deb21f50ac7c2c7553839b6d5210efd..42e89974b025355c4ee02268dfd1ca7389d45cdb 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 98a914887f7840cab39939e63a40c063b3fb7a35..2b1f6ceca315731c3b78d3b83c2ac4561d7fbd98 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 6b4404ae6fdceb077a7c288151d26dcf0d65ccd8..79fc0fd3d37724540b37d5ea0c750413a8f34e66 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 bb9e431cd1af6ab0893c9c129042d328c6d49a6d..17a5530ccecd5900fb6366d728b2e321e8dcf994 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 7cd2c576bce6e526db1b3ad1f9c725ce22929e5a..86a8ecce160ca73b90be16afde53cdd850e90972 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 b43b0d4448128d775e05fb515064f4147b2b6279..e11d6ba31b1398155ccbe5c8b6b711ddcd621090 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 68287ca2e8e7b89f33a97611cfefa31bb229d306..dab6e49726da61f2229a434a827ff8e81e06fed9 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 3b93600b192525882dd8d78c6599718f83ac108d..42461c1e6493329cc9d57936c1b332d2175d3bab 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 1ed9dd97743141a9913f6db9edbea96df56b0fdf..bf48fd42a09fbb8b7564d52cac87c07074fd4428 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 bada83ba2a42c8cb96813b5c9f404f5e4f2eb568..a0313f8b892d51c27fa6fb882e993ced1fd8f2ab 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 c3e57948b58d418666e64989e729c622909ef8ef..c218a478a4977a1ea257cde4e2d1c8ca0842083e 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 2606d0cdb0c3a61637c39c57a6b2c8798d2f97ab..49bfd7a13b32c3e9a55d694bf6eb1b71c00ea903 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 91e90d1c6e01b28244a770e817d4fb55e7d18df5..c235ec3e1d49e7481f57f77b9d4b81b95d0dd132 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 d5b0cb5314fdf049aebc0c2e16bb1d76fa726e9f..ce0498f397751670b4af80a488ff5db0c5d86baa 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 d2bceceff7a001fc6bfc894dee3906a47faffac1..6ea9e2f516f1d4d595f98359884ab91fbd08f1d2 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 2300cee581b55fad94e1f793ba125f9cfd5ce703..1c3295ca885fcc91e6da76523764b6dd39a4b1db 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 ad79811e7a8afcc6b1b563bd13b8b9bd42ba589e..ecf180ed9c6bc731f3e23c957960249fb903e6e2 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 e141e41d7137a14c33b83a7c52dc179bfeaa24e4..2d4b7c1b6564c6023671be11bf57a4979195385f 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 f6709449b8e147ea9ceb9ffd0565fd85c58fe956..3d68ccfce21d5889262020847f82263664efef46 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 2d04e3b7e9f8ca596922e28c351c5929c8b550ec..99af9b209ad87b316ed66a8886bb6790064f4a04 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 6042e13692722e536525e47e037852526f80b46e..687bc28a6a36598f8e3cc242f08ca6fc2476a7c9 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 298b05e0757b7b578b66d11b12587412f58d4ffc..be67c72021ec89825727995b89c384e2abbfcc30 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 86b0c4e68296deb49f949e71fa20bcb8aa77cb7b..8ab43c79391da3aadc272c74dc614c7d42577c22 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 ce0aea9619526c37380ae737f8055fb3eb53aafb..5c06f2fd1cee8e1173924ba8a4ebdff32875c0f7 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 9defbc38796648ed987d84ba6dce5e48671b15fa..19a7a8257cc1b494b98a4e26e4271a538852d2b5 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 964edb9105af7c233049b0f083860fcc0da514df..d981d2f67cafb1f09eafdf5eba9658e87ae55c1f 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 7a20095bec32ac52f9548228f90ac384f038d0f5..f7db9b85c90bbcb66c740595edbcafdba1e7a9cd 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 e50c9a1ecaa54d4010ca4da176f5bb861c6982e7..2bfb6bd3383e5bc0fbec1cf07b24fbbf031aa7b5 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 f36a560b08a52398505ff859c93d3dc7002074e0..50a3444df4249753652472a685bf3f60e4b60b0e 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 943fa507cdc0661235649cfe454c0c81e031c6c1..d210840b1ce1d8d6b85c68e4d882e5291009975e 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 e4b635f6714a9f4671da9c1401905fde17ce18af..d51ce2700f4e23dd111562f60cde06f5a2e61b7d 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 9ad66679b7ac4ca1f57aa3ca18e02f7e6afa55c5..34ae3e815fa260418009efddc357ae7bd1c73caf 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 a396bd7c379a9387b2429a0d05ecbb9b865a243e..c6e9b5092fc3a5622e2a243c4bb1400bf6741f12 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 3148190a35a3946ce207ebee0d2404e59b2146c2..701135996a01ef5ef32f50017413282cfc9cf6f9 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 424b1ee5c5f53c4a0665f73b91e6601a4094ae76..c5c501116f4ba7d22fbdc058a9b63b80fe51f9f7 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 d3785a29c150afc9de4a51976e54d95e9004f08a..d0f8a717e71b52946ee29985d010e63f5362daba 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 fa71bb951e50334cd5f08c6f6aee1c5af215c7c5..50c75afa8c559c7f4dc907051a078d14052e39b5 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 b0b8cfa768635a45893c1be7b23f973b6f32143c..5f345e63c845d9a669bcd8d76210555e2c9444c4 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 43acbe5f25cfff209df4bc990ddbbd069ae5f2fc..00f8f6b27f73a74976fe9b13e5143b8390b2b5c2 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 26c18b49a27bae5d2212d9dde6459b7cff2866f0..8ef41380bc3b05fa5145827c6cdb0e6426b9bb7e 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 d888fa50465167fdd57af6fcc34fd0d38079321d..e94baaa48b3c8279c6dd751235a32a9475a0e653 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 e0da9d51b7de0fb38de77e164d1f8e269d62dac7..29021b4c9dec83d7a937ef55f4482afdcd2c5897 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 a77705311b61282e50e1d75e884ecc4d41684164..2b09b9dc112da6025860e5f135fc937328eb806c 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 312a5adb3201bacb1d5c8dca5ac999d4b678f2a5..acefe6a2add2c40e9ba08609e19c934d0ea0a91b 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 30aa6806363f0988ec798259e0c0fdfcf41b4fb8..d34a4a0836f32f402e7bcf13d10f1202af5c6ff8 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 4b4072be29572f691d311509a898b46fe302bfff..5911efc71853bc29b81654cb0436c5e653db8d1a 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 df74f1fedbd4480c97588b762100ed9b69cb6caf..f6edac24a0cebf40a2912b7efaa26910731d87c6 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 117a6c784df6b060eabefa59feecb116ba03df82..14c32e25cfde08bcd175f9de1ad323246c10d4ee 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 7fbdee946ddc63b6d2a57d81d185073b39092121..ec4c0851610f95975d79886f99e3e06d89d2d79e 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 cd47637fd656aa36cb8ed7800128dc71210acabc..e3a8274d047d46872b1415429a54e0741e882122 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 5eb90888b1f9a04d7590afa05ca31d69375236ae..b8c6e85aa6d76f58e4095237c4735f9a4d5fffa5 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 593938750b8d3db85d3dadaecd3626686ae1a238..75dc7017fa11753a6c4ae3c66229e017154602ab 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 664c5d617b3d260c7ad5912026bea2cb87e61385..49ec63b7b7b685b9b5aec9ff4dede6ebd0ecb4d7 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 fae3da5997f69c5f6edb08938ac9bb8136f72bed..d53ddeff6edc2e26cd779fcb99ed5080518c8f9b 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 f8dfc98052f685d2a15f614f0da59edbd810c89d..3788964ab877cde2c85032b52ad9033a3a56e4d5 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 01bfd9328a8a89b631257c581a6e1f25f41719cb..121069adbd0d56fea8c358be3e4eb156ef3f014c 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 d1e3640cac8800df83e0a55b1b491dcc3bae013f..c4a8b54db4860af8923430b1092555f2c65d38f5 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 7f3d6e28352f761d44dfb946d82959f3f296b426..c91682d7c80d7b30cfe4ddfe6c3ec44178fafad3 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 47a2e0c4d61d988c777135d56007771050e59136..4b60cfefb2909467057a5001d6f5367035743d44 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 9fc304b42e3de4a9940b537e4f21d213d82e7a94..d413d634f86602ac2e2ffe94d7960552e5050dc0 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 ea97128b73b8fd0828164eb7015c98a17bc5d300..8456badb88250dd0a7ee535d51d0e875743ea9a0 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 ba0981d5b2464b7e9ed817f71b9f698929e5fc69..46c41d5f9b1f410c0d5260bb6d3dbfa2e1f08d05 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 bdc0d829d998fc5b54341467936cb566aee796ef..e91db03ddbdedb12870104e29931e9e06413baf6 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 fc749db598bb2d0a0d14ba7eb5a53af482301671..429f6a06566c83fbdee442de6bd15bde164eedd8 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 d2cfae86e80ae4c777cabe58957a1e518042c10b..29771e704d3f9f686ce587c42bd1f99f7fd644fc 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 5e5bf91f2ddebb7e5bf40747ac37ce8e58ebeea7..c9bf0814068aac45a1185a73f49f8cf8dbfe5192 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 f68f9a3cd807470a63c23271d0d6ffb241f1ac51..4055e3245d2a84508450dbbcdfb3af8d9e1825a9 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 e2f7f282e3666c92ae3a69cf0dd16c7cde314003..a127cfed8b3a6a2dc9d3849266615ca4b38fac8b 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 088335c920220503960efa877873e5886bc098b1..007704022c11c597163fd2c485468bf8112ab710 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 7c67c26ef71e92e77c984b173fb7db5e4c495be5..1d3927714580455d3e4df231d6514575adfac928 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 af4b5a06996cf27089678b12190d595ad3cb7b7c..969c46722d394b7f174b1f48d6854cef0b6f109b 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 636664b45d67a0a3fbe21938952650b4ad624e6a..f178cae0c701eed5e3b2495554dc6a140a112a77 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 009e4c083165289b30ad44570c9b6ec91aae1fb9..7b94fd3cd4c1609ae3addbd231cd1fa0fbb02ae0 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 d05a8805b688f22e24846473dc89273e1b6f8ae2..27e64255a788832710954aed46f2c143eb068d66 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 e64d637fd6b256694c0d3217588e785e4080c9b7..bb0c4a1175fc251575978d8dfbf0f3c3013c22aa 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 841c278d016c2ba02b403d0e78cedab6bca76d24..36e90f4647f388f4cc3f078cac22f421bd21cb9d 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 f131a773befd64847fcf846cf4401239513e20b6..7533bc12ea131a194fcfd557667df0d07c94c74a 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 f6ea228652813091383ee1a868bbda2730b73632..63aa1ac1e867f7de9c11d4c35bbf432d8f916f3a 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 79981ec998e36d6a83d48b29300a446c1b226605..a78a1663a154e0ffe5d50139ee8f10f79f617cec 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 774856e738bb64249d4c4e7a3647b0615d7d0e7d..8a5893d8d5d9b1064d4fdb6820c20957a255cb22 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 fb5499b51599fdb12f207a5b39100c87c6d43bf7..4c78afd3b5a54f38b9e09dd343094d279dfd31dc 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 4e73fc168c627054cd2f1e39aa03683b6debaf95..b2479fc31814cd8c30031a3b36faaf3a5b16eb18 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 be74b972b2a75e957480aeb868470900ce77e11b..7ee2999d7a30366c17762d763058d463904a23b3 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 581835e6d7021d22d8fc2cc1b212a3ba83f82358..a5a9d1895bf19273843547b99ea7730939697add 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 9ef017a23a4222c60a4bb2fa3c70c48e29d6d0fe..250ba1d61d1d945bdd4977dc597f7fc977ea58c8 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 669819b33765e19b90889b3c1aacf6093ff84633..30144690920905c2a3a18bcad1b9dc5c1b685c28 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 5b324e1d4d38d34daacaf366aa79558f86a47091..b680448145c4732e5c002083410d83f0738c9811 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 16f229c1936ef5ca69385800357a5792071c2e43..2045792f03f96491cb5d6f48e4c2acac635e7301 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 24fb4a61da1c0b457265e8a782a851f5c9bffe11..8d77ff25abee3b129bcf75858714dc9217e03832 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 658d63e055fc5fe116e641b703a9c89ed41358b9..d6d4a236a61989ef3975daa75adcca09a85731f2 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 1a8057b20c3ecba19008e6e3f364f2f9ff4920e5..d816bcd46a88b624bb3eaeba862aa25d011d7fe3 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 d674c6ffd8679961221a9bc62750e67c572cb728..75c7e2259b63afadb80b7442c89f9832122f295c 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 9f7d737e275141e169652f018301adc113189a1f..77c8b92150aaccbae9705a74b940f0d81dc90c81 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 03d6f59e19581df994c78c9db5be4958b2007ca7..25f3631534c12b03d03fb9d018313e906b6ee10e 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 e3f9cfd5ff3ef48a49bd2596d286ee0701f3c717..25a82208c0a3f35aa3e6d05c327920e354de9dc3 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 f64ff95f22d8c35e8f0e00e6b9ac25a0b8364401..1a93c6279e7df64a01fa8c3c72ca7d92764fbd0f 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 551bf930b1a8b4275fc6238871e02b9eeaad84a1..c539f6fca3de050dec4c141f8ef783742412bcde 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 b23cdee2c6b0a8ba7b17f40acb1a40428d5e3684..08cddea841824eb4bdf51abb237b9cddc64897ec 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 118598ab8497e35ad0596d9bc9ea6b4bc213f87f..5fe50d2f919a6f7285cc08bb241e07e699817d80 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 89da48b46dea5f60f87d638ab36628dc6aac01c5..f9613b5ac55f072e7f72185b5d247463c4d62ef2 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 e8b280df334312860df14b470f6f1786c1a11960..5b8b67fa3ba575457a9f2e395f5505b105501117 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 0d21ca20d77640d8fad8329df07c1c0a4e755ad1..3657e5cc3b80dd3491e86988d762f440d03dcc29 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