diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako
index 2532267758a..a4b58892eef 100644
--- a/support/windows/Servo.wxs.mako
+++ b/support/windows/Servo.wxs.mako
@@ -115,20 +115,6 @@
DiskId="1"/>
-
-
-
-
-
-
-
-
${include_directory(path.join(top_path, "resources"), "resources")}
${include_directory(browserhtml_path, "browserhtml")}
@@ -151,7 +137,6 @@
-
% for c in components:
% endfor
diff --git a/support/windows/fonts.conf b/support/windows/fonts.conf
deleted file mode 100644
index 904c9832eb9..00000000000
--- a/support/windows/fonts.conf
+++ /dev/null
@@ -1,777 +0,0 @@
-
-
-
- C:\Windows\Fonts
-
-
-
- mono
-
-
- monospace
-
-
-
-
-
-
- sans serif
-
-
- sans-serif
-
-
-
-
-
-
- sans
-
-
- sans-serif
-
-
-
-
-
-
-
-~/.fontconfig
-
-
-
-
-
-
-
-
- Nazli
- serif
-
-
- Lotoos
- serif
-
-
- Mitra
- serif
-
-
- Ferdosi
- serif
-
-
- Badr
- serif
-
-
- Zar
- serif
-
-
- Titr
- serif
-
-
- Jadid
- serif
-
-
- Kochi Mincho
- serif
-
-
- AR PL SungtiL GB
- serif
-
-
- AR PL Mingti2L Big5
- serif
-
-
- MS 明朝
- serif
-
-
- NanumMyeongjo
- serif
-
-
- UnBatang
- serif
-
-
- Baekmuk Batang
- serif
-
-
- MgOpen Canonica
- serif
-
-
- Sazanami Mincho
- serif
-
-
- AR PL ZenKai Uni
- serif
-
-
- ZYSong18030
- serif
-
-
- FreeSerif
- serif
-
-
- SimSun
- serif
-
-
-
- Arshia
- sans-serif
-
-
- Elham
- sans-serif
-
-
- Farnaz
- sans-serif
-
-
- Nasim
- sans-serif
-
-
- Sina
- sans-serif
-
-
- Roya
- sans-serif
-
-
- Koodak
- sans-serif
-
-
- Terafik
- sans-serif
-
-
- Kochi Gothic
- sans-serif
-
-
- AR PL KaitiM GB
- sans-serif
-
-
- AR PL KaitiM Big5
- sans-serif
-
-
- MS ゴシック
- sans-serif
-
-
- NanumGothic
- sans-serif
-
-
- UnDotum
- sans-serif
-
-
- Baekmuk Dotum
- sans-serif
-
-
- MgOpen Modata
- sans-serif
-
-
- Sazanami Gothic
- sans-serif
-
-
- AR PL ShanHeiSun Uni
- sans-serif
-
-
- ZYSong18030
- sans-serif
-
-
- FreeSans
- sans-serif
-
-
-
- NSimSun
- monospace
-
-
- ZYSong18030
- monospace
-
-
- NanumGothicCoding
- monospace
-
-
- FreeMono
- monospace
-
-
-
-
- Homa
- fantasy
-
-
- Kamran
- fantasy
-
-
- Fantezi
- fantasy
-
-
- Tabassom
- fantasy
-
-
-
-
- IranNastaliq
- cursive
-
-
- Nafees Nastaleeq
- cursive
-
-
-
-
-
-
- Bitstream Vera Serif
- serif
-
-
- DejaVu Serif
- serif
-
-
- Liberation Serif
- serif
-
-
- Times New Roman
- serif
-
-
- Times
- serif
-
-
- Nimbus Roman No9 L
- serif
-
-
- Nimbus Roman
- serif
-
-
- Luxi Serif
- serif
-
-
- Thorndale AMT
- serif
-
-
- Thorndale
- serif
-
-
- Georgia
- serif
-
-
- Garamond
- serif
-
-
- Palatino Linotype
- serif
-
-
-
- Bitstream Vera Sans
- sans-serif
-
-
- DejaVu Sans
- sans-serif
-
-
- Liberation Sans
- sans-serif
-
-
- Arial
- sans-serif
-
-
- Helvetica
- sans-serif
-
-
- Verdana
- sans-serif
-
-
- Albany AMT
- sans-serif
-
-
- Albany
- sans-serif
-
-
- Nimbus Sans L
- sans-serif
-
-
- Nimbus Sans
- sans-serif
-
-
- Luxi Sans
- sans-serif
-
-
- Trebuchet MS
- sans-serif
-
-
-
- Bitstream Vera Sans Mono
- monospace
-
-
- DejaVu Sans Mono
- monospace
-
-
- Liberation Mono
- monospace
-
-
- Inconsolata
- monospace
-
-
- Courier New
- monospace
-
-
- Courier
- monospace
-
-
- Andale Mono
- monospace
-
-
- Luxi Mono
- monospace
-
-
- Cumberland AMT
- monospace
-
-
- Cumberland
- monospace
-
-
- Nimbus Mono L
- monospace
-
-
- Nimbus Mono
- monospace
-
-
-
- Impact
- fantasy
-
-
- Copperplate Gothic Std
- fantasy
-
-
- Cooper Std
- fantasy
-
-
- Bauhaus Std
- fantasy
-
-
-
- ITC Zapf Chancery Std
- cursive
-
-
- Zapfino
- cursive
-
-
- Comic Sans MS
- cursive
-
-
-
-
-
- sans-serif
-
-
- serif
-
-
- monospace
-
-
- sans-serif
-
-
-
- serif
-
- Bitstream Vera Serif
- DejaVu Serif
- Times New Roman
- Thorndale AMT
- Luxi Serif
- Nimbus Roman No9 L
- Nimbus Roman
- Times
-
-
-
- sans-serif
-
- Bitstream Vera Sans
- DejaVu Sans
- Verdana
- Arial
- Albany AMT
- Luxi Sans
- Nimbus Sans L
- Nimbus Sans
- Helvetica
- Lucida Sans Unicode
- BPG Glaho International
- Tahoma
-
-
-
- monospace
-
- Bitstream Vera Sans Mono
- DejaVu Sans Mono
- Inconsolata
- Andale Mono
- Courier New
- Cumberland AMT
- Luxi Mono
- Nimbus Mono L
- Nimbus Mono
- Courier
-
-
-
-
- fantasy
-
- Impact
- Copperplate Gothic Std
- Cooper Std
- Bauhaus Std
-
-
-
-
- cursive
-
- ITC Zapf Chancery Std
- Zapfino
- Comic Sans MS
-
-
-
-
- serif
-
- Artsounk
- BPG UTF8 M
- Kinnari
- Norasi
- Frank Ruehl
- Dror
- JG LaoTimes
- Saysettha Unicode
- Pigiarniq
- B Davat
- B Compset
- Kacst-Qr
- Urdu Nastaliq Unicode
- Raghindi
- Mukti Narrow
- malayalam
- Sampige
- padmaa
- Hapax Berbère
- MS Mincho
- SimSun
- PMingLiu
- WenQuanYi Zen Hei
- WenQuanYi Bitmap Song
- AR PL ShanHeiSun Uni
- AR PL New Sung
- ZYSong18030
- HanyiSong
- MgOpen Canonica
- Sazanami Mincho
- IPAMonaMincho
- IPAMincho
- Kochi Mincho
- AR PL SungtiL GB
- AR PL Mingti2L Big5
- AR PL Zenkai Uni
- MS 明朝
- ZYSong18030
- NanumMyeongjo
- UnBatang
- Baekmuk Batang
- KacstQura
- Frank Ruehl CLM
- Lohit Bengali
- Lohit Gujarati
- Lohit Hindi
- Lohit Marathi
- Lohit Maithili
- Lohit Kashmiri
- Lohit Konkani
- Lohit Nepali
- Lohit Sindhi
- Lohit Punjabi
- Lohit Tamil
- Meera
- Lohit Malayalam
- Lohit Kannada
- Lohit Telugu
- Lohit Oriya
- LKLUG
-
-
-
- sans-serif
-
- Nachlieli
- Lucida Sans Unicode
- Yudit Unicode
- Kerkis
- ArmNet Helvetica
- Artsounk
- BPG UTF8 M
- Waree
- Loma
- Garuda
- Umpush
- Saysettha Unicode
- JG Lao Old Arial
- GF Zemen Unicode
- Pigiarniq
- B Davat
- B Compset
- Kacst-Qr
- Urdu Nastaliq Unicode
- Raghindi
- Mukti Narrow
- malayalam
- Sampige
- padmaa
- Hapax Berbère
- MS Gothic
- UmePlus P Gothic
-
- SimSun
- PMingLiu
- WenQuanYi Zen Hei
- WenQuanYi Bitmap Song
- AR PL ShanHeiSun Uni
- AR PL New Sung
- MgOpen Modata
- VL Gothic
- IPAMonaGothic
- IPAGothic
- Sazanami Gothic
- Kochi Gothic
- AR PL KaitiM GB
- AR PL KaitiM Big5
- AR PL ShanHeiSun Uni
- AR PL SungtiL GB
- AR PL Mingti2L Big5
- MS ゴシック
- ZYSong18030
- TSCu_Paranar
- NanumGothic
- UnDotum
- Baekmuk Dotum
- Baekmuk Gulim
- KacstQura
- Lohit Bengali
- Lohit Gujarati
- Lohit Hindi
- Lohit Marathi
- Lohit Maithili
- Lohit Kashmiri
- Lohit Konkani
- Lohit Nepali
- Lohit Sindhi
- Lohit Punjabi
- Lohit Tamil
- Meera
- Lohit Malayalam
- Lohit Kannada
- Lohit Telugu
- Lohit Oriya
- LKLUG
-
-
-
- monospace
-
- Miriam Mono
- VL Gothic
- IPAMonaGothic
- IPAGothic
- Sazanami Gothic
- Kochi Gothic
- AR PL KaitiM GB
- MS Gothic
- UmePlus Gothic
- NSimSun
- MingLiu
- AR PL ShanHeiSun Uni
- AR PL New Sung Mono
- HanyiSong
- AR PL SungtiL GB
- AR PL Mingti2L Big5
- ZYSong18030
- NanumGothicCoding
- NanumGothic
- UnDotum
- Baekmuk Dotum
- Baekmuk Gulim
- TlwgTypo
- TlwgTypist
- TlwgTypewriter
- TlwgMono
- Hasida
- Mitra Mono
- GF Zemen Unicode
- Hapax Berbère
- Lohit Bengali
- Lohit Gujarati
- Lohit Hindi
- Lohit Marathi
- Lohit Maithili
- Lohit Kashmiri
- Lohit Konkani
- Lohit Nepali
- Lohit Sindhi
- Lohit Punjabi
- Lohit Tamil
- Meera
- Lohit Malayalam
- Lohit Kannada
- Lohit Telugu
- Lohit Oriya
- LKLUG
-
-
-
- serif
-
- FreeSerif
- Code2000
- Code2001
-
-
-
- sans-serif
-
- FreeSans
- Arial Unicode MS
- Arial Unicode
- Code2000
- Code2001
-
-
-
- monospace
-
- FreeMono
-
-
-
-