rbutil: Merge rbutil with utils folder.

rbutil uses several components from the utils folder, and can be
considered part of utils too. Having it in a separate folder is an
arbitrary split that doesn't help anymore these days, so merge them.

This also allows other utils to easily use libtools.make without the
need to navigate to a different folder.

Change-Id: I3fc2f4de19e3e776553efb5dea5f779dfec0dc21

494 files changed, 13 insertions, 13 deletions

diff --git a/rbutil/bspatch/LICENSE b/utils/bspatch/LICENSE
index c82090b3eb..c82090b3eb 100644
--- a/rbutil/bspatch/LICENSE
+++ b/utils/bspatch/LICENSE
diff --git a/rbutil/bspatch/Makefile b/utils/bspatch/Makefile
index 8f287a5ebb..8f287a5ebb 100644
--- a/rbutil/bspatch/Makefile
+++ b/utils/bspatch/Makefile
diff --git a/rbutil/bspatch/bspatch.c b/utils/bspatch/bspatch.c
index d1d7a5aa7a..d1d7a5aa7a 100644
--- a/rbutil/bspatch/bspatch.c
+++ b/utils/bspatch/bspatch.c
diff --git a/rbutil/bspatch/bspatch.h b/utils/bspatch/bspatch.h
index 46edd5db0c..46edd5db0c 100644
--- a/rbutil/bspatch/bspatch.h
+++ b/utils/bspatch/bspatch.h
diff --git a/rbutil/bspatch/main.c b/utils/bspatch/main.c
index e130457256..e130457256 100644
--- a/rbutil/bspatch/main.c
+++ b/utils/bspatch/main.c
diff --git a/rbutil/bzip2/LICENSE b/utils/bzip2/LICENSE
index cc614178cf..cc614178cf 100644
--- a/rbutil/bzip2/LICENSE
+++ b/utils/bzip2/LICENSE
diff --git a/rbutil/bzip2/Makefile b/utils/bzip2/Makefile
index 6dc59ed025..6dc59ed025 100644
--- a/rbutil/bzip2/Makefile
+++ b/utils/bzip2/Makefile
diff --git a/rbutil/bzip2/blocksort.c b/utils/bzip2/blocksort.c
index d0d662cd4e..d0d662cd4e 100644
--- a/rbutil/bzip2/blocksort.c
+++ b/utils/bzip2/blocksort.c
diff --git a/rbutil/bzip2/bzlib.c b/utils/bzip2/bzlib.c
index 6e78e19407..6e78e19407 100644
--- a/rbutil/bzip2/bzlib.c
+++ b/utils/bzip2/bzlib.c
diff --git a/rbutil/bzip2/bzlib.h b/utils/bzip2/bzlib.h
index 8277123da8..8277123da8 100644
--- a/rbutil/bzip2/bzlib.h
+++ b/utils/bzip2/bzlib.h
diff --git a/rbutil/bzip2/bzlib_private.h b/utils/bzip2/bzlib_private.h
index d2b1a97ccb..d2b1a97ccb 100644
--- a/rbutil/bzip2/bzlib_private.h
+++ b/utils/bzip2/bzlib_private.h
diff --git a/rbutil/bzip2/compress.c b/utils/bzip2/compress.c
index caf7696011..caf7696011 100644
--- a/rbutil/bzip2/compress.c
+++ b/utils/bzip2/compress.c
diff --git a/rbutil/bzip2/crctable.c b/utils/bzip2/crctable.c
index 1fea7e946c..1fea7e946c 100644
--- a/rbutil/bzip2/crctable.c
+++ b/utils/bzip2/crctable.c
diff --git a/rbutil/bzip2/decompress.c b/utils/bzip2/decompress.c
index 311f5668f9..311f5668f9 100644
--- a/rbutil/bzip2/decompress.c
+++ b/utils/bzip2/decompress.c
diff --git a/rbutil/bzip2/huffman.c b/utils/bzip2/huffman.c
index 2283fdbc5a..2283fdbc5a 100644
--- a/rbutil/bzip2/huffman.c
+++ b/utils/bzip2/huffman.c
diff --git a/rbutil/bzip2/randtable.c b/utils/bzip2/randtable.c
index 6d62459906..6d62459906 100644
--- a/rbutil/bzip2/randtable.c
+++ b/utils/bzip2/randtable.c
diff --git a/rbutil/chinachippatcher/Makefile b/utils/chinachippatcher/Makefile
index c8defcb5c4..c8defcb5c4 100644
--- a/rbutil/chinachippatcher/Makefile
+++ b/utils/chinachippatcher/Makefile
diff --git a/rbutil/chinachippatcher/chinachip.c b/utils/chinachippatcher/chinachip.c
index 79b5acad66..79b5acad66 100644
--- a/rbutil/chinachippatcher/chinachip.c
+++ b/utils/chinachippatcher/chinachip.c
diff --git a/rbutil/chinachippatcher/chinachip.h b/utils/chinachippatcher/chinachip.h
index b92066bb8b..b92066bb8b 100644
--- a/rbutil/chinachippatcher/chinachip.h
+++ b/utils/chinachippatcher/chinachip.h
diff --git a/rbutil/chinachippatcher/main.c b/utils/chinachippatcher/main.c
index e7779774c9..e7779774c9 100644
--- a/rbutil/chinachippatcher/main.c
+++ b/utils/chinachippatcher/main.c
diff --git a/rbutil/e200rpatcher/Makefile b/utils/e200rpatcher/Makefile
index dfe5c1e037..dfe5c1e037 100644
--- a/rbutil/e200rpatcher/Makefile
+++ b/utils/e200rpatcher/Makefile
diff --git a/rbutil/e200rpatcher/README b/utils/e200rpatcher/README
index 1942b3aa7a..1942b3aa7a 100644
--- a/rbutil/e200rpatcher/README
+++ b/utils/e200rpatcher/README
diff --git a/rbutil/e200rpatcher/e200rpatcher.c b/utils/e200rpatcher/e200rpatcher.c
index be09370997..be09370997 100644
--- a/rbutil/e200rpatcher/e200rpatcher.c
+++ b/utils/e200rpatcher/e200rpatcher.c
diff --git a/rbutil/e200rpatcher/e200rpatcher.manifest b/utils/e200rpatcher/e200rpatcher.manifest
index ec0c49df33..ec0c49df33 100644
--- a/rbutil/e200rpatcher/e200rpatcher.manifest
+++ b/utils/e200rpatcher/e200rpatcher.manifest
diff --git a/rbutil/e200rpatcher/e200rpatcher.rc b/utils/e200rpatcher/e200rpatcher.rc
index 4d80442d44..4d80442d44 100644
--- a/rbutil/e200rpatcher/e200rpatcher.rc
+++ b/utils/e200rpatcher/e200rpatcher.rc
diff --git a/rbutil/ibassoboot/jni/Android.mk b/utils/ibassoboot/jni/Android.mk
index 9cd667c5b9..9cd667c5b9 100644
--- a/rbutil/ibassoboot/jni/Android.mk
+++ b/utils/ibassoboot/jni/Android.mk
diff --git a/rbutil/ibassoboot/jni/chooser.bmp b/utils/ibassoboot/jni/chooser.bmp
index 3e6742d600..3e6742d600 100644
--- a/rbutil/ibassoboot/jni/chooser.bmp
+++ b/utils/ibassoboot/jni/chooser.bmp
diff --git a/rbutil/ibassoboot/jni/ibassodualboot.c b/utils/ibassoboot/jni/ibassodualboot.c
index 0458ff1b71..0458ff1b71 100644
--- a/rbutil/ibassoboot/jni/ibassodualboot.c
+++ b/utils/ibassoboot/jni/ibassodualboot.c
diff --git a/rbutil/ibassoboot/jni/qdbmp.c b/utils/ibassoboot/jni/qdbmp.c
index fd1337277d..fd1337277d 100644
--- a/rbutil/ibassoboot/jni/qdbmp.c
+++ b/utils/ibassoboot/jni/qdbmp.c
diff --git a/rbutil/ibassoboot/jni/qdbmp.h b/utils/ibassoboot/jni/qdbmp.h
index d6c0e6c452..d6c0e6c452 100644
--- a/rbutil/ibassoboot/jni/qdbmp.h
+++ b/utils/ibassoboot/jni/qdbmp.h
diff --git a/rbutil/ibassoboot/jni/rbmissing.bmp b/utils/ibassoboot/jni/rbmissing.bmp
index 1e97066d8c..1e97066d8c 100644
--- a/rbutil/ibassoboot/jni/rbmissing.bmp
+++ b/utils/ibassoboot/jni/rbmissing.bmp
diff --git a/rbutil/ibassoboot/jni/usb.bmp b/utils/ibassoboot/jni/usb.bmp
index c462de2236..c462de2236 100644
--- a/rbutil/ibassoboot/jni/usb.bmp
+++ b/utils/ibassoboot/jni/usb.bmp
diff --git a/rbutil/ipodpatcher/Makefile b/utils/ipodpatcher/Makefile
index 4254995d22..4254995d22 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/utils/ipodpatcher/Makefile
diff --git a/rbutil/ipodpatcher/arc4.c b/utils/ipodpatcher/arc4.c
index 75b1862b89..75b1862b89 100644
--- a/rbutil/ipodpatcher/arc4.c
+++ b/utils/ipodpatcher/arc4.c
diff --git a/rbutil/ipodpatcher/arc4.h b/utils/ipodpatcher/arc4.h
index 8bff0e2dc1..8bff0e2dc1 100644
--- a/rbutil/ipodpatcher/arc4.h
+++ b/utils/ipodpatcher/arc4.h
diff --git a/rbutil/ipodpatcher/fat32format.c b/utils/ipodpatcher/fat32format.c
index 7ee8021cbf..7ee8021cbf 100644
--- a/rbutil/ipodpatcher/fat32format.c
+++ b/utils/ipodpatcher/fat32format.c
diff --git a/rbutil/ipodpatcher/ipodio-posix.c b/utils/ipodpatcher/ipodio-posix.c
index 9b386d994f..9b386d994f 100644
--- a/rbutil/ipodpatcher/ipodio-posix.c
+++ b/utils/ipodpatcher/ipodio-posix.c
diff --git a/rbutil/ipodpatcher/ipodio-win32-scsi.c b/utils/ipodpatcher/ipodio-win32-scsi.c
index 16460cfba3..16460cfba3 100644
--- a/rbutil/ipodpatcher/ipodio-win32-scsi.c
+++ b/utils/ipodpatcher/ipodio-win32-scsi.c
diff --git a/rbutil/ipodpatcher/ipodio-win32.c b/utils/ipodpatcher/ipodio-win32.c
index cea218774a..cea218774a 100644
--- a/rbutil/ipodpatcher/ipodio-win32.c
+++ b/utils/ipodpatcher/ipodio-win32.c
diff --git a/rbutil/ipodpatcher/ipodio.h b/utils/ipodpatcher/ipodio.h
index 4f1a35dd09..4f1a35dd09 100644
--- a/rbutil/ipodpatcher/ipodio.h
+++ b/utils/ipodpatcher/ipodio.h
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/utils/ipodpatcher/ipodpatcher.c
index e047e52abe..e047e52abe 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/utils/ipodpatcher/ipodpatcher.c
diff --git a/rbutil/ipodpatcher/ipodpatcher.h b/utils/ipodpatcher/ipodpatcher.h
index 2cd2331666..2cd2331666 100644
--- a/rbutil/ipodpatcher/ipodpatcher.h
+++ b/utils/ipodpatcher/ipodpatcher.h
diff --git a/rbutil/ipodpatcher/ipodpatcher.manifest b/utils/ipodpatcher/ipodpatcher.manifest
index 695ecb26ea..695ecb26ea 100644
--- a/rbutil/ipodpatcher/ipodpatcher.manifest
+++ b/utils/ipodpatcher/ipodpatcher.manifest
diff --git a/rbutil/ipodpatcher/ipodpatcher.pro b/utils/ipodpatcher/ipodpatcher.pro
index fac1e35f00..fac1e35f00 100644
--- a/rbutil/ipodpatcher/ipodpatcher.pro
+++ b/utils/ipodpatcher/ipodpatcher.pro
diff --git a/rbutil/ipodpatcher/ipodpatcher.rc b/utils/ipodpatcher/ipodpatcher.rc
index e440b51271..e440b51271 100644
--- a/rbutil/ipodpatcher/ipodpatcher.rc
+++ b/utils/ipodpatcher/ipodpatcher.rc
diff --git a/rbutil/ipodpatcher/main.c b/utils/ipodpatcher/main.c
index 7b0a909178..7b0a909178 100644
--- a/rbutil/ipodpatcher/main.c
+++ b/utils/ipodpatcher/main.c
diff --git a/rbutil/ipodpatcher/parttypes.h b/utils/ipodpatcher/parttypes.h
index f8de303553..f8de303553 100644
--- a/rbutil/ipodpatcher/parttypes.h
+++ b/utils/ipodpatcher/parttypes.h
diff --git a/rbutil/jztool/Makefile b/utils/jztool/Makefile
index d1bbae578c..d1bbae578c 100644
--- a/rbutil/jztool/Makefile
+++ b/utils/jztool/Makefile
diff --git a/rbutil/jztool/README.md b/utils/jztool/README.md
index 72c630c6c3..72c630c6c3 100644
--- a/rbutil/jztool/README.md
+++ b/utils/jztool/README.md
diff --git a/rbutil/jztool/include/jztool.h b/utils/jztool/include/jztool.h
index 9d3c08c5bc..9d3c08c5bc 100644
--- a/rbutil/jztool/include/jztool.h
+++ b/utils/jztool/include/jztool.h
diff --git a/rbutil/jztool/jztool.c b/utils/jztool/jztool.c
index dcd78137b3..dcd78137b3 100644
--- a/rbutil/jztool/jztool.c
+++ b/utils/jztool/jztool.c
diff --git a/rbutil/jztool/src/buffer.c b/utils/jztool/src/buffer.c
index 9e9c9ff5d1..9e9c9ff5d1 100644
--- a/rbutil/jztool/src/buffer.c
+++ b/utils/jztool/src/buffer.c
diff --git a/rbutil/jztool/src/context.c b/utils/jztool/src/context.c
index d269d1eece..d269d1eece 100644
--- a/rbutil/jztool/src/context.c
+++ b/utils/jztool/src/context.c
diff --git a/rbutil/jztool/src/device_info.c b/utils/jztool/src/device_info.c
index cc431959ca..cc431959ca 100644
--- a/rbutil/jztool/src/device_info.c
+++ b/utils/jztool/src/device_info.c
diff --git a/rbutil/jztool/src/identify_file.c b/utils/jztool/src/identify_file.c
index e475d98a3b..e475d98a3b 100644
--- a/rbutil/jztool/src/identify_file.c
+++ b/utils/jztool/src/identify_file.c
diff --git a/rbutil/jztool/src/jztool_private.h b/utils/jztool/src/jztool_private.h
index 11299f21f9..11299f21f9 100644
--- a/rbutil/jztool/src/jztool_private.h
+++ b/utils/jztool/src/jztool_private.h
diff --git a/rbutil/jztool/src/ucl_unpack.c b/utils/jztool/src/ucl_unpack.c
index 3b199c7008..3b199c7008 100644
--- a/rbutil/jztool/src/ucl_unpack.c
+++ b/utils/jztool/src/ucl_unpack.c
diff --git a/rbutil/jztool/src/usb.c b/utils/jztool/src/usb.c
index cfc3ba60cb..cfc3ba60cb 100644
--- a/rbutil/jztool/src/usb.c
+++ b/utils/jztool/src/usb.c
diff --git a/rbutil/jztool/src/x1000.c b/utils/jztool/src/x1000.c
index f59727a2ca..f59727a2ca 100644
--- a/rbutil/jztool/src/x1000.c
+++ b/utils/jztool/src/x1000.c
diff --git a/rbutil/libtools.make b/utils/libtools.make
index 3ab150e876..3ab150e876 100644
--- a/rbutil/libtools.make
+++ b/utils/libtools.make
diff --git a/rbutil/mkamsboot/.gitignore b/utils/mkamsboot/.gitignore
index 568b1d5a87..568b1d5a87 100644
--- a/rbutil/mkamsboot/.gitignore
+++ b/utils/mkamsboot/.gitignore
diff --git a/rbutil/mkamsboot/Makefile b/utils/mkamsboot/Makefile
index 7100bd9512..7100bd9512 100644
--- a/rbutil/mkamsboot/Makefile
+++ b/utils/mkamsboot/Makefile
diff --git a/rbutil/mkamsboot/README b/utils/mkamsboot/README
index 8e3f202f38..8e3f202f38 100644
--- a/rbutil/mkamsboot/README
+++ b/utils/mkamsboot/README
diff --git a/rbutil/mkamsboot/dualboot.c b/utils/mkamsboot/dualboot.c
index d97ab0e95b..d97ab0e95b 100644
--- a/rbutil/mkamsboot/dualboot.c
+++ b/utils/mkamsboot/dualboot.c
diff --git a/rbutil/mkamsboot/dualboot.h b/utils/mkamsboot/dualboot.h
index 774c35c119..774c35c119 100644
--- a/rbutil/mkamsboot/dualboot.h
+++ b/utils/mkamsboot/dualboot.h
diff --git a/rbutil/mkamsboot/dualboot/.gitignore b/utils/mkamsboot/dualboot/.gitignore
index a0ed5f4ee1..a0ed5f4ee1 100644
--- a/rbutil/mkamsboot/dualboot/.gitignore
+++ b/utils/mkamsboot/dualboot/.gitignore
diff --git a/rbutil/mkamsboot/dualboot/Makefile b/utils/mkamsboot/dualboot/Makefile
index 0aa1e3f7d9..0aa1e3f7d9 100644
--- a/rbutil/mkamsboot/dualboot/Makefile
+++ b/utils/mkamsboot/dualboot/Makefile
diff --git a/rbutil/mkamsboot/dualboot/bin2c.c b/utils/mkamsboot/dualboot/bin2c.c
index b02af88a4d..b02af88a4d 100644
--- a/rbutil/mkamsboot/dualboot/bin2c.c
+++ b/utils/mkamsboot/dualboot/bin2c.c
diff --git a/rbutil/mkamsboot/dualboot/dualboot.S b/utils/mkamsboot/dualboot/dualboot.S
index 4e4dbe5505..4e4dbe5505 100644
--- a/rbutil/mkamsboot/dualboot/dualboot.S
+++ b/utils/mkamsboot/dualboot/dualboot.S
diff --git a/rbutil/mkamsboot/dualboot/nrv2e_d8.S b/utils/mkamsboot/dualboot/nrv2e_d8.S
index d24fb94b2a..d24fb94b2a 100644
--- a/rbutil/mkamsboot/dualboot/nrv2e_d8.S
+++ b/utils/mkamsboot/dualboot/nrv2e_d8.S
diff --git a/rbutil/mkamsboot/main.c b/utils/mkamsboot/main.c
index cf40811ace..cf40811ace 100644
--- a/rbutil/mkamsboot/main.c
+++ b/utils/mkamsboot/main.c
diff --git a/rbutil/mkamsboot/md5.c b/utils/mkamsboot/md5.c
index 530d8df15a..530d8df15a 100644
--- a/rbutil/mkamsboot/md5.c
+++ b/utils/mkamsboot/md5.c
diff --git a/rbutil/mkamsboot/md5.h b/utils/mkamsboot/md5.h
index 71fa395548..71fa395548 100644
--- a/rbutil/mkamsboot/md5.h
+++ b/utils/mkamsboot/md5.h
diff --git a/rbutil/mkamsboot/mkamsboot.c b/utils/mkamsboot/mkamsboot.c
index 09eb15ee43..09eb15ee43 100644
--- a/rbutil/mkamsboot/mkamsboot.c
+++ b/utils/mkamsboot/mkamsboot.c
diff --git a/rbutil/mkamsboot/mkamsboot.h b/utils/mkamsboot/mkamsboot.h
index 263fe9e9c1..263fe9e9c1 100644
--- a/rbutil/mkamsboot/mkamsboot.h
+++ b/utils/mkamsboot/mkamsboot.h
diff --git a/rbutil/mkimxboot/Makefile b/utils/mkimxboot/Makefile
index 966423159a..966423159a 100644
--- a/rbutil/mkimxboot/Makefile
+++ b/utils/mkimxboot/Makefile
diff --git a/rbutil/mkimxboot/dualboot.c b/utils/mkimxboot/dualboot.c
index dd43a63d2d..dd43a63d2d 100644
--- a/rbutil/mkimxboot/dualboot.c
+++ b/utils/mkimxboot/dualboot.c
diff --git a/rbutil/mkimxboot/dualboot.h b/utils/mkimxboot/dualboot.h
index fbce031d56..fbce031d56 100644
--- a/rbutil/mkimxboot/dualboot.h
+++ b/utils/mkimxboot/dualboot.h
diff --git a/rbutil/mkimxboot/dualboot/Makefile b/utils/mkimxboot/dualboot/Makefile
index b80233226a..b80233226a 100644
--- a/rbutil/mkimxboot/dualboot/Makefile
+++ b/utils/mkimxboot/dualboot/Makefile
diff --git a/rbutil/mkimxboot/dualboot/bin2c.c b/utils/mkimxboot/dualboot/bin2c.c
index b02af88a4d..b02af88a4d 100644
--- a/rbutil/mkimxboot/dualboot/bin2c.c
+++ b/utils/mkimxboot/dualboot/bin2c.c
diff --git a/rbutil/mkimxboot/dualboot/config.h b/utils/mkimxboot/dualboot/config.h
index e9ea8d4a35..e9ea8d4a35 100644
--- a/rbutil/mkimxboot/dualboot/config.h
+++ b/utils/mkimxboot/dualboot/config.h
diff --git a/rbutil/mkimxboot/dualboot/dualboot.c b/utils/mkimxboot/dualboot/dualboot.c
index 77b816bf76..77b816bf76 100644
--- a/rbutil/mkimxboot/dualboot/dualboot.c
+++ b/utils/mkimxboot/dualboot/dualboot.c
diff --git a/rbutil/mkimxboot/dualboot/dualboot.lds b/utils/mkimxboot/dualboot/dualboot.lds
index 09739aee15..09739aee15 100644
--- a/rbutil/mkimxboot/dualboot/dualboot.lds
+++ b/utils/mkimxboot/dualboot/dualboot.lds
diff --git a/rbutil/mkimxboot/main.c b/utils/mkimxboot/main.c
index 5b8cceb044..5b8cceb044 100644
--- a/rbutil/mkimxboot/main.c
+++ b/utils/mkimxboot/main.c
diff --git a/rbutil/mkimxboot/md5.c b/utils/mkimxboot/md5.c
index 530d8df15a..530d8df15a 100644
--- a/rbutil/mkimxboot/md5.c
+++ b/utils/mkimxboot/md5.c
diff --git a/rbutil/mkimxboot/md5.h b/utils/mkimxboot/md5.h
index 71fa395548..71fa395548 100644
--- a/rbutil/mkimxboot/md5.h
+++ b/utils/mkimxboot/md5.h
diff --git a/rbutil/mkimxboot/mkimxboot.c b/utils/mkimxboot/mkimxboot.c
index 0483b5aeee..0483b5aeee 100644
--- a/rbutil/mkimxboot/mkimxboot.c
+++ b/utils/mkimxboot/mkimxboot.c
diff --git a/rbutil/mkimxboot/mkimxboot.h b/utils/mkimxboot/mkimxboot.h
index 6bf0415e9c..6bf0415e9c 100644
--- a/rbutil/mkimxboot/mkimxboot.h
+++ b/utils/mkimxboot/mkimxboot.h
diff --git a/rbutil/mkmpioboot/Makefile b/utils/mkmpioboot/Makefile
index 8aa2d37028..8aa2d37028 100644
--- a/rbutil/mkmpioboot/Makefile
+++ b/utils/mkmpioboot/Makefile
diff --git a/rbutil/mkmpioboot/main.c b/utils/mkmpioboot/main.c
index 9861cba261..9861cba261 100644
--- a/rbutil/mkmpioboot/main.c
+++ b/utils/mkmpioboot/main.c
diff --git a/rbutil/mkmpioboot/mkmpioboot.c b/utils/mkmpioboot/mkmpioboot.c
index ea619ed2f2..ea619ed2f2 100644
--- a/rbutil/mkmpioboot/mkmpioboot.c
+++ b/utils/mkmpioboot/mkmpioboot.c
diff --git a/rbutil/mkmpioboot/mkmpioboot.h b/utils/mkmpioboot/mkmpioboot.h
index 4828ac953e..4828ac953e 100644
--- a/rbutil/mkmpioboot/mkmpioboot.h
+++ b/utils/mkmpioboot/mkmpioboot.h
diff --git a/rbutil/mknwzboot/Makefile b/utils/mknwzboot/Makefile
index 3cbb2ef9dd..3cbb2ef9dd 100644
--- a/rbutil/mknwzboot/Makefile
+++ b/utils/mknwzboot/Makefile
diff --git a/rbutil/mknwzboot/install_script.sh b/utils/mknwzboot/install_script.sh
index 76bd12c4d5..76bd12c4d5 100644
--- a/rbutil/mknwzboot/install_script.sh
+++ b/utils/mknwzboot/install_script.sh
diff --git a/rbutil/mknwzboot/main.c b/utils/mknwzboot/main.c
index 491a18043b..491a18043b 100644
--- a/rbutil/mknwzboot/main.c
+++ b/utils/mknwzboot/main.c
diff --git a/rbutil/mknwzboot/mknwzboot.c b/utils/mknwzboot/mknwzboot.c
index 22885674d8..22885674d8 100644
--- a/rbutil/mknwzboot/mknwzboot.c
+++ b/utils/mknwzboot/mknwzboot.c
diff --git a/rbutil/mknwzboot/mknwzboot.h b/utils/mknwzboot/mknwzboot.h
index 31f2c6355e..31f2c6355e 100644
--- a/rbutil/mknwzboot/mknwzboot.h
+++ b/utils/mknwzboot/mknwzboot.h
diff --git a/rbutil/mknwzboot/uninstall_script.sh b/utils/mknwzboot/uninstall_script.sh
index 0e409c63cd..0e409c63cd 100644
--- a/rbutil/mknwzboot/uninstall_script.sh
+++ b/utils/mknwzboot/uninstall_script.sh
diff --git a/rbutil/mkrk27boot/Makefile b/utils/mkrk27boot/Makefile
index cbb7231f66..cbb7231f66 100644
--- a/rbutil/mkrk27boot/Makefile
+++ b/utils/mkrk27boot/Makefile
diff --git a/rbutil/mkrk27boot/ata-sim.c b/utils/mkrk27boot/ata-sim.c
index 129c4b36a9..129c4b36a9 100644
--- a/rbutil/mkrk27boot/ata-sim.c
+++ b/utils/mkrk27boot/ata-sim.c
diff --git a/rbutil/mkrk27boot/autoconf.h b/utils/mkrk27boot/autoconf.h
index a4907d4599..a4907d4599 100644
--- a/rbutil/mkrk27boot/autoconf.h
+++ b/utils/mkrk27boot/autoconf.h
diff --git a/rbutil/mkrk27boot/main.c b/utils/mkrk27boot/main.c
index 5ba69b5a98..5ba69b5a98 100644
--- a/rbutil/mkrk27boot/main.c
+++ b/utils/mkrk27boot/main.c
diff --git a/rbutil/mkrk27boot/mkrk27boot.c b/utils/mkrk27boot/mkrk27boot.c
index 0ecdf93506..0ecdf93506 100644
--- a/rbutil/mkrk27boot/mkrk27boot.c
+++ b/utils/mkrk27boot/mkrk27boot.c
diff --git a/rbutil/mkrk27boot/mkrk27boot.h b/utils/mkrk27boot/mkrk27boot.h
index dc8c2e8133..dc8c2e8133 100644
--- a/rbutil/mkrk27boot/mkrk27boot.h
+++ b/utils/mkrk27boot/mkrk27boot.h
diff --git a/rbutil/mks5lboot/.gitignore b/utils/mks5lboot/.gitignore
index 9b9b1de6ab..9b9b1de6ab 100644
--- a/rbutil/mks5lboot/.gitignore
+++ b/utils/mks5lboot/.gitignore
diff --git a/rbutil/mks5lboot/Makefile b/utils/mks5lboot/Makefile
index 72ea521d5f..72ea521d5f 100644
--- a/rbutil/mks5lboot/Makefile
+++ b/utils/mks5lboot/Makefile
diff --git a/rbutil/mks5lboot/README b/utils/mks5lboot/README
index c424f7e617..c424f7e617 100644
--- a/rbutil/mks5lboot/README
+++ b/utils/mks5lboot/README
diff --git a/rbutil/mks5lboot/dualboot.c b/utils/mks5lboot/dualboot.c
index 4c1608fc41..4c1608fc41 100644
--- a/rbutil/mks5lboot/dualboot.c
+++ b/utils/mks5lboot/dualboot.c
diff --git a/rbutil/mks5lboot/dualboot.h b/utils/mks5lboot/dualboot.h
index c8952a4c07..c8952a4c07 100644
--- a/rbutil/mks5lboot/dualboot.h
+++ b/utils/mks5lboot/dualboot.h
diff --git a/rbutil/mks5lboot/dualboot/.gitignore b/utils/mks5lboot/dualboot/.gitignore
index 34c53b3c82..34c53b3c82 100644
--- a/rbutil/mks5lboot/dualboot/.gitignore
+++ b/utils/mks5lboot/dualboot/.gitignore
diff --git a/rbutil/mks5lboot/dualboot/Makefile b/utils/mks5lboot/dualboot/Makefile
index 51ce816ca0..51ce816ca0 100644
--- a/rbutil/mks5lboot/dualboot/Makefile
+++ b/utils/mks5lboot/dualboot/Makefile
diff --git a/rbutil/mks5lboot/dualboot/autoconf.h b/utils/mks5lboot/dualboot/autoconf.h
index cd5b3f9aeb..cd5b3f9aeb 100644
--- a/rbutil/mks5lboot/dualboot/autoconf.h
+++ b/utils/mks5lboot/dualboot/autoconf.h
diff --git a/rbutil/mks5lboot/dualboot/bin2c.c b/utils/mks5lboot/dualboot/bin2c.c
index 4d74a19696..4d74a19696 100644
--- a/rbutil/mks5lboot/dualboot/bin2c.c
+++ b/utils/mks5lboot/dualboot/bin2c.c
diff --git a/rbutil/mks5lboot/dualboot/dualboot.c b/utils/mks5lboot/dualboot/dualboot.c
index b8167ec124..b8167ec124 100644
--- a/rbutil/mks5lboot/dualboot/dualboot.c
+++ b/utils/mks5lboot/dualboot/dualboot.c
diff --git a/rbutil/mks5lboot/dualboot/dualboot.lds b/utils/mks5lboot/dualboot/dualboot.lds
index cb92e2a286..cb92e2a286 100644
--- a/rbutil/mks5lboot/dualboot/dualboot.lds
+++ b/utils/mks5lboot/dualboot/dualboot.lds
diff --git a/rbutil/mks5lboot/dualboot/init.S b/utils/mks5lboot/dualboot/init.S
index bd049515f4..bd049515f4 100644
--- a/rbutil/mks5lboot/dualboot/init.S
+++ b/utils/mks5lboot/dualboot/init.S
diff --git a/rbutil/mks5lboot/ipoddfu.c b/utils/mks5lboot/ipoddfu.c
index 5e2914af4b..5e2914af4b 100644
--- a/rbutil/mks5lboot/ipoddfu.c
+++ b/utils/mks5lboot/ipoddfu.c
diff --git a/rbutil/mks5lboot/main.c b/utils/mks5lboot/main.c
index 31e16eca82..31e16eca82 100644
--- a/rbutil/mks5lboot/main.c
+++ b/utils/mks5lboot/main.c
diff --git a/rbutil/mks5lboot/mkdfu.c b/utils/mks5lboot/mkdfu.c
index bb1929bffd..bb1929bffd 100644
--- a/rbutil/mks5lboot/mkdfu.c
+++ b/utils/mks5lboot/mkdfu.c
diff --git a/rbutil/mks5lboot/mks5lboot.h b/utils/mks5lboot/mks5lboot.h
index 084bec61f9..084bec61f9 100644
--- a/rbutil/mks5lboot/mks5lboot.h
+++ b/utils/mks5lboot/mks5lboot.h
diff --git a/rbutil/mktccboot/Makefile b/utils/mktccboot/Makefile
index 4943a8c568..4943a8c568 100644
--- a/rbutil/mktccboot/Makefile
+++ b/utils/mktccboot/Makefile
diff --git a/rbutil/mktccboot/README b/utils/mktccboot/README
index 719846f2e8..719846f2e8 100644
--- a/rbutil/mktccboot/README
+++ b/utils/mktccboot/README
diff --git a/rbutil/mktccboot/main.c b/utils/mktccboot/main.c
index 4dd5d0c6c4..4dd5d0c6c4 100644
--- a/rbutil/mktccboot/main.c
+++ b/utils/mktccboot/main.c
diff --git a/rbutil/mktccboot/mktccboot.c b/utils/mktccboot/mktccboot.c
index 4f2c3258db..4f2c3258db 100644
--- a/rbutil/mktccboot/mktccboot.c
+++ b/utils/mktccboot/mktccboot.c
diff --git a/rbutil/mktccboot/mktccboot.h b/utils/mktccboot/mktccboot.h
index 17179c11e7..17179c11e7 100644
--- a/rbutil/mktccboot/mktccboot.h
+++ b/utils/mktccboot/mktccboot.h
diff --git a/rbutil/mkzenboot/Makefile b/utils/mkzenboot/Makefile
index ebc7a1670a..ebc7a1670a 100644
--- a/rbutil/mkzenboot/Makefile
+++ b/utils/mkzenboot/Makefile
diff --git a/rbutil/mkzenboot/dualboot.c b/utils/mkzenboot/dualboot.c
index 4c98468b3b..4c98468b3b 100644
--- a/rbutil/mkzenboot/dualboot.c
+++ b/utils/mkzenboot/dualboot.c
diff --git a/rbutil/mkzenboot/dualboot.h b/utils/mkzenboot/dualboot.h
index 2497d2900c..2497d2900c 100644
--- a/rbutil/mkzenboot/dualboot.h
+++ b/utils/mkzenboot/dualboot.h
diff --git a/rbutil/mkzenboot/dualboot/Makefile b/utils/mkzenboot/dualboot/Makefile
index 752cc3ca28..752cc3ca28 100644
--- a/rbutil/mkzenboot/dualboot/Makefile
+++ b/utils/mkzenboot/dualboot/Makefile
diff --git a/rbutil/mkzenboot/dualboot/bin2c.c b/utils/mkzenboot/dualboot/bin2c.c
index b02af88a4d..b02af88a4d 100644
--- a/rbutil/mkzenboot/dualboot/bin2c.c
+++ b/utils/mkzenboot/dualboot/bin2c.c
diff --git a/rbutil/mkzenboot/dualboot/config.h b/utils/mkzenboot/dualboot/config.h
index ff59cee710..ff59cee710 100644
--- a/rbutil/mkzenboot/dualboot/config.h
+++ b/utils/mkzenboot/dualboot/config.h
diff --git a/rbutil/mkzenboot/dualboot/dualboot.c b/utils/mkzenboot/dualboot/dualboot.c
index 0b32772afb..0b32772afb 100644
--- a/rbutil/mkzenboot/dualboot/dualboot.c
+++ b/utils/mkzenboot/dualboot/dualboot.c
diff --git a/rbutil/mkzenboot/dualboot/dualboot.lds b/utils/mkzenboot/dualboot/dualboot.lds
index 7444a1e427..7444a1e427 100644
--- a/rbutil/mkzenboot/dualboot/dualboot.lds
+++ b/utils/mkzenboot/dualboot/dualboot.lds
diff --git a/rbutil/mkzenboot/main.c b/utils/mkzenboot/main.c
index 7aef2b76a3..7aef2b76a3 100644
--- a/rbutil/mkzenboot/main.c
+++ b/utils/mkzenboot/main.c
diff --git a/rbutil/mkzenboot/md5.c b/utils/mkzenboot/md5.c
index 530d8df15a..530d8df15a 100644
--- a/rbutil/mkzenboot/md5.c
+++ b/utils/mkzenboot/md5.c
diff --git a/rbutil/mkzenboot/md5.h b/utils/mkzenboot/md5.h
index 71fa395548..71fa395548 100644
--- a/rbutil/mkzenboot/md5.h
+++ b/utils/mkzenboot/md5.h
diff --git a/rbutil/mkzenboot/mkzenboot.c b/utils/mkzenboot/mkzenboot.c
index 88d6821759..88d6821759 100644
--- a/rbutil/mkzenboot/mkzenboot.c
+++ b/utils/mkzenboot/mkzenboot.c
diff --git a/rbutil/mkzenboot/mkzenboot.h b/utils/mkzenboot/mkzenboot.h
index 8da3e25762..8da3e25762 100644
--- a/rbutil/mkzenboot/mkzenboot.h
+++ b/utils/mkzenboot/mkzenboot.h
diff --git a/rbutil/mkzenboot/utils.c b/utils/mkzenboot/utils.c
index b8ef3be237..b8ef3be237 100644
--- a/rbutil/mkzenboot/utils.c
+++ b/utils/mkzenboot/utils.c
diff --git a/rbutil/mkzenboot/utils.h b/utils/mkzenboot/utils.h
index 56edb4e20b..56edb4e20b 100644
--- a/rbutil/mkzenboot/utils.h
+++ b/utils/mkzenboot/utils.h
diff --git a/rbutil/rbutil.pro b/utils/rbutil.pro
index d5d9053d6d..d5d9053d6d 100644
--- a/rbutil/rbutil.pro
+++ b/utils/rbutil.pro
diff --git a/rbutil/rbutilqt/INSTALL b/utils/rbutilqt/INSTALL
index 884e7b3739..884e7b3739 100644
--- a/rbutil/rbutilqt/INSTALL
+++ b/utils/rbutilqt/INSTALL
diff --git a/rbutil/rbutilqt/Info.plist b/utils/rbutilqt/Info.plist
index af905a3f1e..af905a3f1e 100644
--- a/rbutil/rbutilqt/Info.plist
+++ b/utils/rbutilqt/Info.plist
diff --git a/rbutil/rbutilqt/Makefile.libs b/utils/rbutilqt/Makefile.libs
index f95fd52ab9..a78f8b86e9 100644
--- a/rbutil/rbutilqt/Makefile.libs
+++ b/utils/rbutilqt/Makefile.libs
@@ -49,31 +49,31 @@ libucl:
         $(SILENT)$(MAKE) -C $(RBBASE_DIR)/tools/ucl/src BUILD_DIR=$(BUILD_DIR)/ucl libucl.a
 
 libipodpatcher:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/ipodpatcher BUILD_DIR=$(BUILD_DIR)/ipodpatcher libipodpatcher.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/ipodpatcher BUILD_DIR=$(BUILD_DIR)/ipodpatcher libipodpatcher.a CC=$(CC)
 
 libsansapatcher:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/sansapatcher BUILD_DIR=$(BUILD_DIR)/sansapatcher libsansapatcher.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/sansapatcher BUILD_DIR=$(BUILD_DIR)/sansapatcher libsansapatcher.a CC=$(CC)
 
 libmkamsboot:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkamsboot BUILD_DIR=$(BUILD_DIR)/mkamsboot libmkamsboot.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mkamsboot BUILD_DIR=$(BUILD_DIR)/mkamsboot libmkamsboot.a CC=$(CC)
 
 libmktccboot:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mktccboot BUILD_DIR=$(BUILD_DIR)/mktccboot libmktccboot.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mktccboot BUILD_DIR=$(BUILD_DIR)/mktccboot libmktccboot.a CC=$(CC)
 
 libmkmpioboot:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkmpioboot BUILD_DIR=$(BUILD_DIR)/mkmpioboot libmkmpioboot.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mkmpioboot BUILD_DIR=$(BUILD_DIR)/mkmpioboot libmkmpioboot.a CC=$(CC)
 
 libchinachippatcher:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/chinachippatcher BUILD_DIR=$(BUILD_DIR)/chinachippatcher libchinachippatcher.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/chinachippatcher BUILD_DIR=$(BUILD_DIR)/chinachippatcher libchinachippatcher.a CC=$(CC)
 
 libmkimxboot:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkimxboot BUILD_DIR=$(BUILD_DIR)/mkimxboot libmkimxboot.a CC=$(CC) CXX=$(CXX)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mkimxboot BUILD_DIR=$(BUILD_DIR)/mkimxboot libmkimxboot.a CC=$(CC) CXX=$(CXX)
 
 libmks5lboot:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC)
 
 libbz2:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbz2.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbz2.a CC=$(CC)
 
 libbspatch:
-        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC)
+        $(SILENT)$(MAKE) -C $(RBBASE_DIR)/utils/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC)
diff --git a/rbutil/rbutilqt/RockboxUtility.desktop b/utils/rbutilqt/RockboxUtility.desktop
index bc5f45d53d..bc5f45d53d 100644
--- a/rbutil/rbutilqt/RockboxUtility.desktop
+++ b/utils/rbutilqt/RockboxUtility.desktop
diff --git a/rbutil/rbutilqt/aboutbox.ui b/utils/rbutilqt/aboutbox.ui
index e13f06a15a..e13f06a15a 100644
--- a/rbutil/rbutilqt/aboutbox.ui
+++ b/utils/rbutilqt/aboutbox.ui
diff --git a/rbutil/rbutilqt/base/archiveutil.cpp b/utils/rbutilqt/base/archiveutil.cpp
index d5f0a12471..d5f0a12471 100644
--- a/rbutil/rbutilqt/base/archiveutil.cpp
+++ b/utils/rbutilqt/base/archiveutil.cpp
diff --git a/rbutil/rbutilqt/base/archiveutil.h b/utils/rbutilqt/base/archiveutil.h
index 76616728c3..76616728c3 100644
--- a/rbutil/rbutilqt/base/archiveutil.h
+++ b/utils/rbutilqt/base/archiveutil.h
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/utils/rbutilqt/base/autodetection.cpp
index 341f219c30..341f219c30 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/utils/rbutilqt/base/autodetection.cpp
diff --git a/rbutil/rbutilqt/base/autodetection.h b/utils/rbutilqt/base/autodetection.h
index cdbb94d303..cdbb94d303 100644
--- a/rbutil/rbutilqt/base/autodetection.h
+++ b/utils/rbutilqt/base/autodetection.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/utils/rbutilqt/base/bootloaderinstallams.cpp
index be43ed52db..be43ed52db 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallams.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.h b/utils/rbutilqt/base/bootloaderinstallams.h
index f3ce15ed24..f3ce15ed24 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallams.h
+++ b/utils/rbutilqt/base/bootloaderinstallams.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/utils/rbutilqt/base/bootloaderinstallbase.cpp
index 096c601b91..096c601b91 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallbase.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.h b/utils/rbutilqt/base/bootloaderinstallbase.h
index 23aac4f92f..23aac4f92f 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbase.h
+++ b/utils/rbutilqt/base/bootloaderinstallbase.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp b/utils/rbutilqt/base/bootloaderinstallbspatch.cpp
index 02291b0151..02291b0151 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbspatch.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallbspatch.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbspatch.h b/utils/rbutilqt/base/bootloaderinstallbspatch.h
index 7108820fda..7108820fda 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbspatch.h
+++ b/utils/rbutilqt/base/bootloaderinstallbspatch.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp b/utils/rbutilqt/base/bootloaderinstallchinachip.cpp
index f6af952b9a..f6af952b9a 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallchinachip.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.h b/utils/rbutilqt/base/bootloaderinstallchinachip.h
index e92f292283..e92f292283 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallchinachip.h
+++ b/utils/rbutilqt/base/bootloaderinstallchinachip.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp b/utils/rbutilqt/base/bootloaderinstallfile.cpp
index bf3d5e449d..bf3d5e449d 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallfile.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallfile.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallfile.h b/utils/rbutilqt/base/bootloaderinstallfile.h
index 9f9586279c..9f9586279c 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallfile.h
+++ b/utils/rbutilqt/base/bootloaderinstallfile.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhelper.cpp b/utils/rbutilqt/base/bootloaderinstallhelper.cpp
index c94ed29140..c94ed29140 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallhelper.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallhelper.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhelper.h b/utils/rbutilqt/base/bootloaderinstallhelper.h
index c89444d7a7..c89444d7a7 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallhelper.h
+++ b/utils/rbutilqt/base/bootloaderinstallhelper.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp b/utils/rbutilqt/base/bootloaderinstallhex.cpp
index b3dde0bbfa..b3dde0bbfa 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallhex.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.h b/utils/rbutilqt/base/bootloaderinstallhex.h
index 700d77447a..700d77447a 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallhex.h
+++ b/utils/rbutilqt/base/bootloaderinstallhex.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp b/utils/rbutilqt/base/bootloaderinstallimx.cpp
index 7428cf10c8..7428cf10c8 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallimx.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallimx.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallimx.h b/utils/rbutilqt/base/bootloaderinstallimx.h
index 1d780998ef..1d780998ef 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallimx.h
+++ b/utils/rbutilqt/base/bootloaderinstallimx.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/utils/rbutilqt/base/bootloaderinstallipod.cpp
index 807c6e870b..807c6e870b 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallipod.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.h b/utils/rbutilqt/base/bootloaderinstallipod.h
index ac69c608d6..ac69c608d6 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.h
+++ b/utils/rbutilqt/base/bootloaderinstallipod.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/utils/rbutilqt/base/bootloaderinstallmi4.cpp
index 2657347b87..2657347b87 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallmi4.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.h b/utils/rbutilqt/base/bootloaderinstallmi4.h
index c56669b99f..c56669b99f 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmi4.h
+++ b/utils/rbutilqt/base/bootloaderinstallmi4.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp b/utils/rbutilqt/base/bootloaderinstallmpio.cpp
index 863418e591..863418e591 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallmpio.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.h b/utils/rbutilqt/base/bootloaderinstallmpio.h
index 8e6c65affe..8e6c65affe 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmpio.h
+++ b/utils/rbutilqt/base/bootloaderinstallmpio.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/utils/rbutilqt/base/bootloaderinstalls5l.cpp
index 63a30ff2b0..63a30ff2b0 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
+++ b/utils/rbutilqt/base/bootloaderinstalls5l.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.h b/utils/rbutilqt/base/bootloaderinstalls5l.h
index e2a44a031f..e2a44a031f 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalls5l.h
+++ b/utils/rbutilqt/base/bootloaderinstalls5l.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/utils/rbutilqt/base/bootloaderinstallsansa.cpp
index b1f0167e42..b1f0167e42 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallsansa.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.h b/utils/rbutilqt/base/bootloaderinstallsansa.h
index 45837f0ac3..45837f0ac3 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallsansa.h
+++ b/utils/rbutilqt/base/bootloaderinstallsansa.h
diff --git a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp b/utils/rbutilqt/base/bootloaderinstalltcc.cpp
index ffc8555733..ffc8555733 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalltcc.cpp
+++ b/utils/rbutilqt/base/bootloaderinstalltcc.cpp
diff --git a/rbutil/rbutilqt/base/bootloaderinstalltcc.h b/utils/rbutilqt/base/bootloaderinstalltcc.h
index cc1fd45802..cc1fd45802 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalltcc.h
+++ b/utils/rbutilqt/base/bootloaderinstalltcc.h
diff --git a/rbutil/rbutilqt/base/encoderbase.cpp b/utils/rbutilqt/base/encoderbase.cpp
index fe45eee49b..fe45eee49b 100644
--- a/rbutil/rbutilqt/base/encoderbase.cpp
+++ b/utils/rbutilqt/base/encoderbase.cpp
diff --git a/rbutil/rbutilqt/base/encoderbase.h b/utils/rbutilqt/base/encoderbase.h
index 810b38aa9e..810b38aa9e 100644
--- a/rbutil/rbutilqt/base/encoderbase.h
+++ b/utils/rbutilqt/base/encoderbase.h
diff --git a/rbutil/rbutilqt/base/encoderexe.cpp b/utils/rbutilqt/base/encoderexe.cpp
index 331b5fb2a4..331b5fb2a4 100644
--- a/rbutil/rbutilqt/base/encoderexe.cpp
+++ b/utils/rbutilqt/base/encoderexe.cpp
diff --git a/rbutil/rbutilqt/base/encoderexe.h b/utils/rbutilqt/base/encoderexe.h
index 4008689167..4008689167 100644
--- a/rbutil/rbutilqt/base/encoderexe.h
+++ b/utils/rbutilqt/base/encoderexe.h
diff --git a/rbutil/rbutilqt/base/encoderlame.cpp b/utils/rbutilqt/base/encoderlame.cpp
index 1658a7092d..1658a7092d 100644
--- a/rbutil/rbutilqt/base/encoderlame.cpp
+++ b/utils/rbutilqt/base/encoderlame.cpp
diff --git a/rbutil/rbutilqt/base/encoderlame.h b/utils/rbutilqt/base/encoderlame.h
index a5f1b2d3f4..a5f1b2d3f4 100644
--- a/rbutil/rbutilqt/base/encoderlame.h
+++ b/utils/rbutilqt/base/encoderlame.h
diff --git a/rbutil/rbutilqt/base/encoderrbspeex.cpp b/utils/rbutilqt/base/encoderrbspeex.cpp
index 2bee66028a..2bee66028a 100644
--- a/rbutil/rbutilqt/base/encoderrbspeex.cpp
+++ b/utils/rbutilqt/base/encoderrbspeex.cpp
diff --git a/rbutil/rbutilqt/base/encoderrbspeex.h b/utils/rbutilqt/base/encoderrbspeex.h
index 6ad41c38a3..6ad41c38a3 100644
--- a/rbutil/rbutilqt/base/encoderrbspeex.h
+++ b/utils/rbutilqt/base/encoderrbspeex.h
diff --git a/rbutil/rbutilqt/base/encttssettings.cpp b/utils/rbutilqt/base/encttssettings.cpp
index 9c8c2e57fd..9c8c2e57fd 100644
--- a/rbutil/rbutilqt/base/encttssettings.cpp
+++ b/utils/rbutilqt/base/encttssettings.cpp
diff --git a/rbutil/rbutilqt/base/encttssettings.h b/utils/rbutilqt/base/encttssettings.h
index 1258d81d57..1258d81d57 100644
--- a/rbutil/rbutilqt/base/encttssettings.h
+++ b/utils/rbutilqt/base/encttssettings.h
diff --git a/rbutil/rbutilqt/base/httpget.cpp b/utils/rbutilqt/base/httpget.cpp
index 2df9501fd6..2df9501fd6 100644
--- a/rbutil/rbutilqt/base/httpget.cpp
+++ b/utils/rbutilqt/base/httpget.cpp
diff --git a/rbutil/rbutilqt/base/httpget.h b/utils/rbutilqt/base/httpget.h
index dfd7b87c89..dfd7b87c89 100644
--- a/rbutil/rbutilqt/base/httpget.h
+++ b/utils/rbutilqt/base/httpget.h
diff --git a/rbutil/rbutilqt/base/mspackutil.cpp b/utils/rbutilqt/base/mspackutil.cpp
index b794272199..b794272199 100644
--- a/rbutil/rbutilqt/base/mspackutil.cpp
+++ b/utils/rbutilqt/base/mspackutil.cpp
diff --git a/rbutil/rbutilqt/base/mspackutil.h b/utils/rbutilqt/base/mspackutil.h
index 1cb4350b13..1cb4350b13 100644
--- a/rbutil/rbutilqt/base/mspackutil.h
+++ b/utils/rbutilqt/base/mspackutil.h
diff --git a/rbutil/rbutilqt/base/playerbuildinfo.cpp b/utils/rbutilqt/base/playerbuildinfo.cpp
index f118a9fd7a..f118a9fd7a 100644
--- a/rbutil/rbutilqt/base/playerbuildinfo.cpp
+++ b/utils/rbutilqt/base/playerbuildinfo.cpp
diff --git a/rbutil/rbutilqt/base/playerbuildinfo.h b/utils/rbutilqt/base/playerbuildinfo.h
index 6a88f750ed..6a88f750ed 100644
--- a/rbutil/rbutilqt/base/playerbuildinfo.h
+++ b/utils/rbutilqt/base/playerbuildinfo.h
diff --git a/rbutil/rbutilqt/base/progressloggerinterface.h b/utils/rbutilqt/base/progressloggerinterface.h
index ae4270ae6b..ae4270ae6b 100644
--- a/rbutil/rbutilqt/base/progressloggerinterface.h
+++ b/utils/rbutilqt/base/progressloggerinterface.h
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/utils/rbutilqt/base/rbsettings.cpp
index 8eaa01f7f6..8eaa01f7f6 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/utils/rbutilqt/base/rbsettings.cpp
diff --git a/rbutil/rbutilqt/base/rbsettings.h b/utils/rbutilqt/base/rbsettings.h
index ef0c4eb134..ef0c4eb134 100644
--- a/rbutil/rbutilqt/base/rbsettings.h
+++ b/utils/rbutilqt/base/rbsettings.h
diff --git a/rbutil/rbutilqt/base/rockboxinfo.cpp b/utils/rbutilqt/base/rockboxinfo.cpp
index f34adbfc2f..f34adbfc2f 100644
--- a/rbutil/rbutilqt/base/rockboxinfo.cpp
+++ b/utils/rbutilqt/base/rockboxinfo.cpp
diff --git a/rbutil/rbutilqt/base/rockboxinfo.h b/utils/rbutilqt/base/rockboxinfo.h
index af5cf227f7..af5cf227f7 100644
--- a/rbutil/rbutilqt/base/rockboxinfo.h
+++ b/utils/rbutilqt/base/rockboxinfo.h
diff --git a/rbutil/rbutilqt/base/system.cpp b/utils/rbutilqt/base/system.cpp
index dafab971ec..dafab971ec 100644
--- a/rbutil/rbutilqt/base/system.cpp
+++ b/utils/rbutilqt/base/system.cpp
diff --git a/rbutil/rbutilqt/base/system.h b/utils/rbutilqt/base/system.h
index 61f0a6f1a9..61f0a6f1a9 100644
--- a/rbutil/rbutilqt/base/system.h
+++ b/utils/rbutilqt/base/system.h
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/utils/rbutilqt/base/talkfile.cpp
index cef53c852b..cef53c852b 100644
--- a/rbutil/rbutilqt/base/talkfile.cpp
+++ b/utils/rbutilqt/base/talkfile.cpp
diff --git a/rbutil/rbutilqt/base/talkfile.h b/utils/rbutilqt/base/talkfile.h
index 11dd95ca14..11dd95ca14 100644
--- a/rbutil/rbutilqt/base/talkfile.h
+++ b/utils/rbutilqt/base/talkfile.h
diff --git a/rbutil/rbutilqt/base/talkgenerator.cpp b/utils/rbutilqt/base/talkgenerator.cpp
index 9139ceb274..9139ceb274 100644
--- a/rbutil/rbutilqt/base/talkgenerator.cpp
+++ b/utils/rbutilqt/base/talkgenerator.cpp
diff --git a/rbutil/rbutilqt/base/talkgenerator.h b/utils/rbutilqt/base/talkgenerator.h
index 3e2f9394fb..3e2f9394fb 100644
--- a/rbutil/rbutilqt/base/talkgenerator.h
+++ b/utils/rbutilqt/base/talkgenerator.h
diff --git a/rbutil/rbutilqt/base/ttsbase.cpp b/utils/rbutilqt/base/ttsbase.cpp
index 0102d215a6..0102d215a6 100644
--- a/rbutil/rbutilqt/base/ttsbase.cpp
+++ b/utils/rbutilqt/base/ttsbase.cpp
diff --git a/rbutil/rbutilqt/base/ttsbase.h b/utils/rbutilqt/base/ttsbase.h
index 125fe49ff4..125fe49ff4 100644
--- a/rbutil/rbutilqt/base/ttsbase.h
+++ b/utils/rbutilqt/base/ttsbase.h
diff --git a/rbutil/rbutilqt/base/ttscarbon.cpp b/utils/rbutilqt/base/ttscarbon.cpp
index 2d9fa49dbe..2d9fa49dbe 100644
--- a/rbutil/rbutilqt/base/ttscarbon.cpp
+++ b/utils/rbutilqt/base/ttscarbon.cpp
diff --git a/rbutil/rbutilqt/base/ttscarbon.h b/utils/rbutilqt/base/ttscarbon.h
index 2e9e84aa7d..2e9e84aa7d 100644
--- a/rbutil/rbutilqt/base/ttscarbon.h
+++ b/utils/rbutilqt/base/ttscarbon.h
diff --git a/rbutil/rbutilqt/base/ttsespeak.h b/utils/rbutilqt/base/ttsespeak.h
index afe19fbdac..afe19fbdac 100644
--- a/rbutil/rbutilqt/base/ttsespeak.h
+++ b/utils/rbutilqt/base/ttsespeak.h
diff --git a/rbutil/rbutilqt/base/ttsespeakng.h b/utils/rbutilqt/base/ttsespeakng.h
index 55aba62e7d..55aba62e7d 100644
--- a/rbutil/rbutilqt/base/ttsespeakng.h
+++ b/utils/rbutilqt/base/ttsespeakng.h
diff --git a/rbutil/rbutilqt/base/ttsexes.cpp b/utils/rbutilqt/base/ttsexes.cpp
index 446725968f..446725968f 100644
--- a/rbutil/rbutilqt/base/ttsexes.cpp
+++ b/utils/rbutilqt/base/ttsexes.cpp
diff --git a/rbutil/rbutilqt/base/ttsexes.h b/utils/rbutilqt/base/ttsexes.h
index 5707c827fe..5707c827fe 100644
--- a/rbutil/rbutilqt/base/ttsexes.h
+++ b/utils/rbutilqt/base/ttsexes.h
diff --git a/rbutil/rbutilqt/base/ttsfestival.cpp b/utils/rbutilqt/base/ttsfestival.cpp
index d0ca400909..d0ca400909 100644
--- a/rbutil/rbutilqt/base/ttsfestival.cpp
+++ b/utils/rbutilqt/base/ttsfestival.cpp
diff --git a/rbutil/rbutilqt/base/ttsfestival.h b/utils/rbutilqt/base/ttsfestival.h
index 5f6dc13ab5..5f6dc13ab5 100644
--- a/rbutil/rbutilqt/base/ttsfestival.h
+++ b/utils/rbutilqt/base/ttsfestival.h
diff --git a/rbutil/rbutilqt/base/ttsflite.h b/utils/rbutilqt/base/ttsflite.h
index 717c311a34..717c311a34 100644
--- a/rbutil/rbutilqt/base/ttsflite.h
+++ b/utils/rbutilqt/base/ttsflite.h
diff --git a/rbutil/rbutilqt/base/ttsmimic.h b/utils/rbutilqt/base/ttsmimic.h
index f4d7a8beac..f4d7a8beac 100644
--- a/rbutil/rbutilqt/base/ttsmimic.h
+++ b/utils/rbutilqt/base/ttsmimic.h
diff --git a/rbutil/rbutilqt/base/ttsmssp.h b/utils/rbutilqt/base/ttsmssp.h
index 817b9fde58..817b9fde58 100644
--- a/rbutil/rbutilqt/base/ttsmssp.h
+++ b/utils/rbutilqt/base/ttsmssp.h
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/utils/rbutilqt/base/ttssapi.cpp
index 1b326b301e..1b326b301e 100644
--- a/rbutil/rbutilqt/base/ttssapi.cpp
+++ b/utils/rbutilqt/base/ttssapi.cpp
diff --git a/rbutil/rbutilqt/base/ttssapi.h b/utils/rbutilqt/base/ttssapi.h
index 25d7d3dab7..25d7d3dab7 100644
--- a/rbutil/rbutilqt/base/ttssapi.h
+++ b/utils/rbutilqt/base/ttssapi.h
diff --git a/rbutil/rbutilqt/base/ttssapi4.h b/utils/rbutilqt/base/ttssapi4.h
index d6408eaa2c..d6408eaa2c 100644
--- a/rbutil/rbutilqt/base/ttssapi4.h
+++ b/utils/rbutilqt/base/ttssapi4.h
diff --git a/rbutil/rbutilqt/base/ttsswift.h b/utils/rbutilqt/base/ttsswift.h
index adbc674d78..adbc674d78 100644
--- a/rbutil/rbutilqt/base/ttsswift.h
+++ b/utils/rbutilqt/base/ttsswift.h
diff --git a/rbutil/rbutilqt/base/uninstall.cpp b/utils/rbutilqt/base/uninstall.cpp
index 5ab670a031..5ab670a031 100644
--- a/rbutil/rbutilqt/base/uninstall.cpp
+++ b/utils/rbutilqt/base/uninstall.cpp
diff --git a/rbutil/rbutilqt/base/uninstall.h b/utils/rbutilqt/base/uninstall.h
index d8c9815117..d8c9815117 100644
--- a/rbutil/rbutilqt/base/uninstall.h
+++ b/utils/rbutilqt/base/uninstall.h
diff --git a/rbutil/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp
index f2d3f04887..f2d3f04887 100644
--- a/rbutil/rbutilqt/base/utils.cpp
+++ b/utils/rbutilqt/base/utils.cpp
diff --git a/rbutil/rbutilqt/base/utils.h b/utils/rbutilqt/base/utils.h
index 7f27c7d321..7f27c7d321 100644
--- a/rbutil/rbutilqt/base/utils.h
+++ b/utils/rbutilqt/base/utils.h
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/utils/rbutilqt/base/voicefile.cpp
index eabf7a721a..eabf7a721a 100644
--- a/rbutil/rbutilqt/base/voicefile.cpp
+++ b/utils/rbutilqt/base/voicefile.cpp
diff --git a/rbutil/rbutilqt/base/voicefile.h b/utils/rbutilqt/base/voicefile.h
index d34535e700..d34535e700 100644
--- a/rbutil/rbutilqt/base/voicefile.h
+++ b/utils/rbutilqt/base/voicefile.h
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/utils/rbutilqt/base/zipinstaller.cpp
index 8de6c53b16..8de6c53b16 100644
--- a/rbutil/rbutilqt/base/zipinstaller.cpp
+++ b/utils/rbutilqt/base/zipinstaller.cpp
diff --git a/rbutil/rbutilqt/base/zipinstaller.h b/utils/rbutilqt/base/zipinstaller.h
index 59a0f785d9..59a0f785d9 100644
--- a/rbutil/rbutilqt/base/zipinstaller.h
+++ b/utils/rbutilqt/base/zipinstaller.h
diff --git a/rbutil/rbutilqt/base/ziputil.cpp b/utils/rbutilqt/base/ziputil.cpp
index 45119f7d99..45119f7d99 100644
--- a/rbutil/rbutilqt/base/ziputil.cpp
+++ b/utils/rbutilqt/base/ziputil.cpp
diff --git a/rbutil/rbutilqt/base/ziputil.h b/utils/rbutilqt/base/ziputil.h
index 25c3dce391..25c3dce391 100644
--- a/rbutil/rbutilqt/base/ziputil.h
+++ b/utils/rbutilqt/base/ziputil.h
diff --git a/rbutil/rbutilqt/changelog.txt b/utils/rbutilqt/changelog.txt
index 992ea19445..992ea19445 100644
--- a/rbutil/rbutilqt/changelog.txt
+++ b/utils/rbutilqt/changelog.txt
diff --git a/rbutil/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp
index 14080a552c..14080a552c 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/utils/rbutilqt/configure.cpp
diff --git a/rbutil/rbutilqt/configure.h b/utils/rbutilqt/configure.h
index 5f63e82447..5f63e82447 100644
--- a/rbutil/rbutilqt/configure.h
+++ b/utils/rbutilqt/configure.h
diff --git a/rbutil/rbutilqt/configurefrm.ui b/utils/rbutilqt/configurefrm.ui
index 8a923893b4..8a923893b4 100644
--- a/rbutil/rbutilqt/configurefrm.ui
+++ b/utils/rbutilqt/configurefrm.ui
diff --git a/rbutil/rbutilqt/createvoicefrm.ui b/utils/rbutilqt/createvoicefrm.ui
index 936abd7ceb..936abd7ceb 100644
--- a/rbutil/rbutilqt/createvoicefrm.ui
+++ b/utils/rbutilqt/createvoicefrm.ui
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/utils/rbutilqt/createvoicewindow.cpp
index 158c1201ce..158c1201ce 100644
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/utils/rbutilqt/createvoicewindow.cpp
diff --git a/rbutil/rbutilqt/createvoicewindow.h b/utils/rbutilqt/createvoicewindow.h
index 87127267c5..87127267c5 100644
--- a/rbutil/rbutilqt/createvoicewindow.h
+++ b/utils/rbutilqt/createvoicewindow.h
diff --git a/rbutil/rbutilqt/dmgbuild.cfg b/utils/rbutilqt/dmgbuild.cfg
index 65d7b274a0..65d7b274a0 100644
--- a/rbutil/rbutilqt/dmgbuild.cfg
+++ b/utils/rbutilqt/dmgbuild.cfg
diff --git a/rbutil/rbutilqt/encttscfggui.cpp b/utils/rbutilqt/encttscfggui.cpp
index 19181c0f8b..19181c0f8b 100644
--- a/rbutil/rbutilqt/encttscfggui.cpp
+++ b/utils/rbutilqt/encttscfggui.cpp
diff --git a/rbutil/rbutilqt/encttscfggui.h b/utils/rbutilqt/encttscfggui.h
index 80af86dabc..80af86dabc 100644
--- a/rbutil/rbutilqt/encttscfggui.h
+++ b/utils/rbutilqt/encttscfggui.h
diff --git a/rbutil/rbutilqt/gui/backupdialog.cpp b/utils/rbutilqt/gui/backupdialog.cpp
index f12c47b570..f12c47b570 100644
--- a/rbutil/rbutilqt/gui/backupdialog.cpp
+++ b/utils/rbutilqt/gui/backupdialog.cpp
diff --git a/rbutil/rbutilqt/gui/backupdialog.h b/utils/rbutilqt/gui/backupdialog.h
index 185166134a..185166134a 100644
--- a/rbutil/rbutilqt/gui/backupdialog.h
+++ b/utils/rbutilqt/gui/backupdialog.h
diff --git a/rbutil/rbutilqt/gui/backupdialogfrm.ui b/utils/rbutilqt/gui/backupdialogfrm.ui
index f843ad3a65..f843ad3a65 100644
--- a/rbutil/rbutilqt/gui/backupdialogfrm.ui
+++ b/utils/rbutilqt/gui/backupdialogfrm.ui
diff --git a/rbutil/rbutilqt/gui/changelog.cpp b/utils/rbutilqt/gui/changelog.cpp
index 79d601e412..79d601e412 100644
--- a/rbutil/rbutilqt/gui/changelog.cpp
+++ b/utils/rbutilqt/gui/changelog.cpp
diff --git a/rbutil/rbutilqt/gui/changelog.h b/utils/rbutilqt/gui/changelog.h
index aca2a6ed32..aca2a6ed32 100644
--- a/rbutil/rbutilqt/gui/changelog.h
+++ b/utils/rbutilqt/gui/changelog.h
diff --git a/rbutil/rbutilqt/gui/changelogfrm.ui b/utils/rbutilqt/gui/changelogfrm.ui
index 0a28ee2421..0a28ee2421 100644
--- a/rbutil/rbutilqt/gui/changelogfrm.ui
+++ b/utils/rbutilqt/gui/changelogfrm.ui
diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp b/utils/rbutilqt/gui/comboboxviewdelegate.cpp
index 91489d10c0..91489d10c0 100644
--- a/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp
+++ b/utils/rbutilqt/gui/comboboxviewdelegate.cpp
diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.h b/utils/rbutilqt/gui/comboboxviewdelegate.h
index a0070bb126..a0070bb126 100644
--- a/rbutil/rbutilqt/gui/comboboxviewdelegate.h
+++ b/utils/rbutilqt/gui/comboboxviewdelegate.h
diff --git a/rbutil/rbutilqt/gui/infowidget.cpp b/utils/rbutilqt/gui/infowidget.cpp
index 25b0503090..25b0503090 100644
--- a/rbutil/rbutilqt/gui/infowidget.cpp
+++ b/utils/rbutilqt/gui/infowidget.cpp
diff --git a/rbutil/rbutilqt/gui/infowidget.h b/utils/rbutilqt/gui/infowidget.h
index 51eef0a37a..51eef0a37a 100644
--- a/rbutil/rbutilqt/gui/infowidget.h
+++ b/utils/rbutilqt/gui/infowidget.h
diff --git a/rbutil/rbutilqt/gui/infowidgetfrm.ui b/utils/rbutilqt/gui/infowidgetfrm.ui
index 8c7fdb30f7..8c7fdb30f7 100644
--- a/rbutil/rbutilqt/gui/infowidgetfrm.ui
+++ b/utils/rbutilqt/gui/infowidgetfrm.ui
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
index 9bfe7414a3..9bfe7414a3 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.h b/utils/rbutilqt/gui/selectiveinstallwidget.h
index c961a387e0..c961a387e0 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.h
+++ b/utils/rbutilqt/gui/selectiveinstallwidget.h
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui b/utils/rbutilqt/gui/selectiveinstallwidgetfrm.ui
index f68ff350f3..f68ff350f3 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui
+++ b/utils/rbutilqt/gui/selectiveinstallwidgetfrm.ui
diff --git a/rbutil/rbutilqt/icons/audio-input-microphone.svg b/utils/rbutilqt/icons/audio-input-microphone.svg
index d31409c4e5..d31409c4e5 100644
--- a/rbutil/rbutilqt/icons/audio-input-microphone.svg
+++ b/utils/rbutilqt/icons/audio-input-microphone.svg
diff --git a/rbutil/rbutilqt/icons/audio-volume-high.svg b/utils/rbutilqt/icons/audio-volume-high.svg
index 0d8e47a50e..0d8e47a50e 100644
--- a/rbutil/rbutilqt/icons/audio-volume-high.svg
+++ b/utils/rbutilqt/icons/audio-volume-high.svg
diff --git a/rbutil/rbutilqt/icons/dialog-error.svg b/utils/rbutilqt/icons/dialog-error.svg
index 6dfc2dea82..6dfc2dea82 100644
--- a/rbutil/rbutilqt/icons/dialog-error.svg
+++ b/utils/rbutilqt/icons/dialog-error.svg
diff --git a/rbutil/rbutilqt/icons/dialog-information.svg b/utils/rbutilqt/icons/dialog-information.svg
index 922b316fac..922b316fac 100644
--- a/rbutil/rbutilqt/icons/dialog-information.svg
+++ b/utils/rbutilqt/icons/dialog-information.svg
diff --git a/rbutil/rbutilqt/icons/dialog-warning.svg b/utils/rbutilqt/icons/dialog-warning.svg
index e09eccafd6..e09eccafd6 100644
--- a/rbutil/rbutilqt/icons/dialog-warning.svg
+++ b/utils/rbutilqt/icons/dialog-warning.svg
diff --git a/rbutil/rbutilqt/icons/document-save.svg b/utils/rbutilqt/icons/document-save.svg
index 2922c4331a..2922c4331a 100644
--- a/rbutil/rbutilqt/icons/document-save.svg
+++ b/utils/rbutilqt/icons/document-save.svg
diff --git a/rbutil/rbutilqt/icons/edit-clear.svg b/utils/rbutilqt/icons/edit-clear.svg
index b2f20d44e7..b2f20d44e7 100644
--- a/rbutil/rbutilqt/icons/edit-clear.svg
+++ b/utils/rbutilqt/icons/edit-clear.svg
diff --git a/rbutil/rbutilqt/icons/edit-find.svg b/utils/rbutilqt/icons/edit-find.svg
index a499b486cf..a499b486cf 100644
--- a/rbutil/rbutilqt/icons/edit-find.svg
+++ b/utils/rbutilqt/icons/edit-find.svg
diff --git a/rbutil/rbutilqt/icons/go-next.svg b/utils/rbutilqt/icons/go-next.svg
index 41e5990b8f..41e5990b8f 100644
--- a/rbutil/rbutilqt/icons/go-next.svg
+++ b/utils/rbutilqt/icons/go-next.svg
diff --git a/rbutil/rbutilqt/icons/input-gaming.svg b/utils/rbutilqt/icons/input-gaming.svg
index 5909a53eaf..5909a53eaf 100644
--- a/rbutil/rbutilqt/icons/input-gaming.svg
+++ b/utils/rbutilqt/icons/input-gaming.svg
diff --git a/rbutil/rbutilqt/icons/media-eject.svg b/utils/rbutilqt/icons/media-eject.svg
index d22eae1a4f..d22eae1a4f 100644
--- a/rbutil/rbutilqt/icons/media-eject.svg
+++ b/utils/rbutilqt/icons/media-eject.svg
diff --git a/rbutil/rbutilqt/icons/multimedia-player.svg b/utils/rbutilqt/icons/multimedia-player.svg
index 01bf244efe..01bf244efe 100644
--- a/rbutil/rbutilqt/icons/multimedia-player.svg
+++ b/utils/rbutilqt/icons/multimedia-player.svg
diff --git a/rbutil/rbutilqt/icons/network-idle.svg b/utils/rbutilqt/icons/network-idle.svg
index 8201ad256a..8201ad256a 100644
--- a/rbutil/rbutilqt/icons/network-idle.svg
+++ b/utils/rbutilqt/icons/network-idle.svg
diff --git a/rbutil/rbutilqt/icons/package-x-generic.svg b/utils/rbutilqt/icons/package-x-generic.svg
index 47beed790f..47beed790f 100644
--- a/rbutil/rbutilqt/icons/package-x-generic.svg
+++ b/utils/rbutilqt/icons/package-x-generic.svg
diff --git a/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png b/utils/rbutilqt/icons/players/archosfmrecorder-small.png
index e9e1e6a982..e9e1e6a982 100644
--- a/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png
+++ b/utils/rbutilqt/icons/players/archosfmrecorder-small.png
diff --git a/rbutil/rbutilqt/icons/players/archosondiofm-small.png b/utils/rbutilqt/icons/players/archosondiofm-small.png
index 8ac3f16ae4..8ac3f16ae4 100644
--- a/rbutil/rbutilqt/icons/players/archosondiofm-small.png
+++ b/utils/rbutilqt/icons/players/archosondiofm-small.png
diff --git a/rbutil/rbutilqt/icons/players/archosondiosp-small.png b/utils/rbutilqt/icons/players/archosondiosp-small.png
index c96c0cb9bb..c96c0cb9bb 100644
--- a/rbutil/rbutilqt/icons/players/archosondiosp-small.png
+++ b/utils/rbutilqt/icons/players/archosondiosp-small.png
diff --git a/rbutil/rbutilqt/icons/players/archosplayer-small.png b/utils/rbutilqt/icons/players/archosplayer-small.png
index 87d6cec6a5..87d6cec6a5 100644
--- a/rbutil/rbutilqt/icons/players/archosplayer-small.png
+++ b/utils/rbutilqt/icons/players/archosplayer-small.png
diff --git a/rbutil/rbutilqt/icons/players/archosrecorder-small.png b/utils/rbutilqt/icons/players/archosrecorder-small.png
index 9e4f5b7d92..9e4f5b7d92 100644
--- a/rbutil/rbutilqt/icons/players/archosrecorder-small.png
+++ b/utils/rbutilqt/icons/players/archosrecorder-small.png
diff --git a/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png b/utils/rbutilqt/icons/players/archosrecorderv2-small.png
index e9e1e6a982..e9e1e6a982 100644
--- a/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png
+++ b/utils/rbutilqt/icons/players/archosrecorderv2-small.png
diff --git a/rbutil/rbutilqt/icons/players/cowond2-small.png b/utils/rbutilqt/icons/players/cowond2-small.png
index b365fc36b0..b365fc36b0 100644
--- a/rbutil/rbutilqt/icons/players/cowond2-small.png
+++ b/utils/rbutilqt/icons/players/cowond2-small.png
diff --git a/rbutil/rbutilqt/icons/players/fonts-small.png b/utils/rbutilqt/icons/players/fonts-small.png
index 4c7cdcb426..4c7cdcb426 100644
--- a/rbutil/rbutilqt/icons/players/fonts-small.png
+++ b/utils/rbutilqt/icons/players/fonts-small.png
diff --git a/rbutil/rbutilqt/icons/players/gigabeatfx-small.png b/utils/rbutilqt/icons/players/gigabeatfx-small.png
index 6d3744f106..6d3744f106 100644
--- a/rbutil/rbutilqt/icons/players/gigabeatfx-small.png
+++ b/utils/rbutilqt/icons/players/gigabeatfx-small.png
diff --git a/rbutil/rbutilqt/icons/players/gigabeats-small.png b/utils/rbutilqt/icons/players/gigabeats-small.png
index 48e905bcb7..48e905bcb7 100644
--- a/rbutil/rbutilqt/icons/players/gigabeats-small.png
+++ b/utils/rbutilqt/icons/players/gigabeats-small.png
diff --git a/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png b/utils/rbutilqt/icons/players/gogearhdd1630-small.png
index ff7b097942..ff7b097942 100644
--- a/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png
+++ b/utils/rbutilqt/icons/players/gogearhdd1630-small.png
diff --git a/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png b/utils/rbutilqt/icons/players/gogearhdd6330-small.png
index 5b7af846b1..5b7af846b1 100644
--- a/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png
+++ b/utils/rbutilqt/icons/players/gogearhdd6330-small.png
diff --git a/rbutil/rbutilqt/icons/players/gogearsa9200-small.png b/utils/rbutilqt/icons/players/gogearsa9200-small.png
index 5d8f70a220..5d8f70a220 100644
--- a/rbutil/rbutilqt/icons/players/gogearsa9200-small.png
+++ b/utils/rbutilqt/icons/players/gogearsa9200-small.png
diff --git a/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png b/utils/rbutilqt/icons/players/hifimanhm60x-small.png
index 1220a5c46d..1220a5c46d 100644
--- a/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png
+++ b/utils/rbutilqt/icons/players/hifimanhm60x-small.png
diff --git a/rbutil/rbutilqt/icons/players/hifimanhm801-small.png b/utils/rbutilqt/icons/players/hifimanhm801-small.png
index 1a9751661d..1a9751661d 100644
--- a/rbutil/rbutilqt/icons/players/hifimanhm801-small.png
+++ b/utils/rbutilqt/icons/players/hifimanhm801-small.png
diff --git a/rbutil/rbutilqt/icons/players/iaudiom3-small.png b/utils/rbutilqt/icons/players/iaudiom3-small.png
index b72cb7dcc2..b72cb7dcc2 100644
--- a/rbutil/rbutilqt/icons/players/iaudiom3-small.png
+++ b/utils/rbutilqt/icons/players/iaudiom3-small.png
diff --git a/rbutil/rbutilqt/icons/players/iaudiom5-small.png b/utils/rbutilqt/icons/players/iaudiom5-small.png
index 40cfff4f01..40cfff4f01 100644
--- a/rbutil/rbutilqt/icons/players/iaudiom5-small.png
+++ b/utils/rbutilqt/icons/players/iaudiom5-small.png
diff --git a/rbutil/rbutilqt/icons/players/iaudiox5-small.png b/utils/rbutilqt/icons/players/iaudiox5-small.png
index e95e434fd5..e95e434fd5 100644
--- a/rbutil/rbutilqt/icons/players/iaudiox5-small.png
+++ b/utils/rbutilqt/icons/players/iaudiox5-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipod1g2g-small.png b/utils/rbutilqt/icons/players/ipod1g2g-small.png
index a573751c2f..a573751c2f 100644
--- a/rbutil/rbutilqt/icons/players/ipod1g2g-small.png
+++ b/utils/rbutilqt/icons/players/ipod1g2g-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipod3g-small.png b/utils/rbutilqt/icons/players/ipod3g-small.png
index 3efc1de071..3efc1de071 100644
--- a/rbutil/rbutilqt/icons/players/ipod3g-small.png
+++ b/utils/rbutilqt/icons/players/ipod3g-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipod4g-small.png b/utils/rbutilqt/icons/players/ipod4g-small.png
index 76cd554090..76cd554090 100644
--- a/rbutil/rbutilqt/icons/players/ipod4g-small.png
+++ b/utils/rbutilqt/icons/players/ipod4g-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipod6g-small.png b/utils/rbutilqt/icons/players/ipod6g-small.png
index b0ab21ee87..b0ab21ee87 100644
--- a/rbutil/rbutilqt/icons/players/ipod6g-small.png
+++ b/utils/rbutilqt/icons/players/ipod6g-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipodcolor-small.png b/utils/rbutilqt/icons/players/ipodcolor-small.png
index 8d530137c8..8d530137c8 100644
--- a/rbutil/rbutilqt/icons/players/ipodcolor-small.png
+++ b/utils/rbutilqt/icons/players/ipodcolor-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipodmini1g-small.png b/utils/rbutilqt/icons/players/ipodmini1g-small.png
index 39f91bdde5..39f91bdde5 100644
--- a/rbutil/rbutilqt/icons/players/ipodmini1g-small.png
+++ b/utils/rbutilqt/icons/players/ipodmini1g-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipodnano1g-small.png b/utils/rbutilqt/icons/players/ipodnano1g-small.png
index 71be0b8ed2..71be0b8ed2 100644
--- a/rbutil/rbutilqt/icons/players/ipodnano1g-small.png
+++ b/utils/rbutilqt/icons/players/ipodnano1g-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipodnano2g-small.png b/utils/rbutilqt/icons/players/ipodnano2g-small.png
index 413c041f7b..413c041f7b 100644
--- a/rbutil/rbutilqt/icons/players/ipodnano2g-small.png
+++ b/utils/rbutilqt/icons/players/ipodnano2g-small.png
diff --git a/rbutil/rbutilqt/icons/players/ipodvideo-small.png b/utils/rbutilqt/icons/players/ipodvideo-small.png
index 40155ba14f..40155ba14f 100644
--- a/rbutil/rbutilqt/icons/players/ipodvideo-small.png
+++ b/utils/rbutilqt/icons/players/ipodvideo-small.png
diff --git a/rbutil/rbutilqt/icons/players/iriverh10-small.png b/utils/rbutilqt/icons/players/iriverh10-small.png
index 8ffe9162d3..8ffe9162d3 100644
--- a/rbutil/rbutilqt/icons/players/iriverh10-small.png
+++ b/utils/rbutilqt/icons/players/iriverh10-small.png
diff --git a/rbutil/rbutilqt/icons/players/iriverh100-small.png b/utils/rbutilqt/icons/players/iriverh100-small.png
index cc13ecf4c6..cc13ecf4c6 100644
--- a/rbutil/rbutilqt/icons/players/iriverh100-small.png
+++ b/utils/rbutilqt/icons/players/iriverh100-small.png
diff --git a/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png b/utils/rbutilqt/icons/players/iriverh10_5gb-small.png
index c034586398..c034586398 100644
--- a/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png
+++ b/utils/rbutilqt/icons/players/iriverh10_5gb-small.png
diff --git a/rbutil/rbutilqt/icons/players/iriverh300-small.png b/utils/rbutilqt/icons/players/iriverh300-small.png
index 3c5657bf00..3c5657bf00 100644
--- a/rbutil/rbutilqt/icons/players/iriverh300-small.png
+++ b/utils/rbutilqt/icons/players/iriverh300-small.png
diff --git a/rbutil/rbutilqt/icons/players/mpiohd200-small.png b/utils/rbutilqt/icons/players/mpiohd200-small.png
index d82ba6c015..d82ba6c015 100644
--- a/rbutil/rbutilqt/icons/players/mpiohd200-small.png
+++ b/utils/rbutilqt/icons/players/mpiohd200-small.png
diff --git a/rbutil/rbutilqt/icons/players/mpiohd300-small.png b/utils/rbutilqt/icons/players/mpiohd300-small.png
index 744dfc09c0..744dfc09c0 100644
--- a/rbutil/rbutilqt/icons/players/mpiohd300-small.png
+++ b/utils/rbutilqt/icons/players/mpiohd300-small.png
diff --git a/rbutil/rbutilqt/icons/players/mrobe100-small.png b/utils/rbutilqt/icons/players/mrobe100-small.png
index 3ab6206a73..3ab6206a73 100644
--- a/rbutil/rbutilqt/icons/players/mrobe100-small.png
+++ b/utils/rbutilqt/icons/players/mrobe100-small.png
diff --git a/rbutil/rbutilqt/icons/players/mrobe500-small.png b/utils/rbutilqt/icons/players/mrobe500-small.png
index 6c08b15495..6c08b15495 100644
--- a/rbutil/rbutilqt/icons/players/mrobe500-small.png
+++ b/utils/rbutilqt/icons/players/mrobe500-small.png
diff --git a/rbutil/rbutilqt/icons/players/samsungyh820-small.png b/utils/rbutilqt/icons/players/samsungyh820-small.png
index 27702e5c61..27702e5c61 100644
--- a/rbutil/rbutilqt/icons/players/samsungyh820-small.png
+++ b/utils/rbutilqt/icons/players/samsungyh820-small.png
diff --git a/rbutil/rbutilqt/icons/players/samsungyh920-small.png b/utils/rbutilqt/icons/players/samsungyh920-small.png
index 0188b4186a..0188b4186a 100644
--- a/rbutil/rbutilqt/icons/players/samsungyh920-small.png
+++ b/utils/rbutilqt/icons/players/samsungyh920-small.png
diff --git a/rbutil/rbutilqt/icons/players/samsungyh925-small.png b/utils/rbutilqt/icons/players/samsungyh925-small.png
index 733bc6fbbd..733bc6fbbd 100644
--- a/rbutil/rbutilqt/icons/players/samsungyh925-small.png
+++ b/utils/rbutilqt/icons/players/samsungyh925-small.png
diff --git a/rbutil/rbutilqt/icons/players/samsungypr0-small.png b/utils/rbutilqt/icons/players/samsungypr0-small.png
index 2183eec0ba..2183eec0ba 100644
--- a/rbutil/rbutilqt/icons/players/samsungypr0-small.png
+++ b/utils/rbutilqt/icons/players/samsungypr0-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansac200-small.png b/utils/rbutilqt/icons/players/sansac200-small.png
index 4678c607c1..4678c607c1 100644
--- a/rbutil/rbutilqt/icons/players/sansac200-small.png
+++ b/utils/rbutilqt/icons/players/sansac200-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansaclip-small.png b/utils/rbutilqt/icons/players/sansaclip-small.png
index a4e1c4a69b..a4e1c4a69b 100644
--- a/rbutil/rbutilqt/icons/players/sansaclip-small.png
+++ b/utils/rbutilqt/icons/players/sansaclip-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansaclipplus-small.png b/utils/rbutilqt/icons/players/sansaclipplus-small.png
index edb7691ae8..edb7691ae8 100644
--- a/rbutil/rbutilqt/icons/players/sansaclipplus-small.png
+++ b/utils/rbutilqt/icons/players/sansaclipplus-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansaclipzip-small.png b/utils/rbutilqt/icons/players/sansaclipzip-small.png
index bc1f2a3fd0..bc1f2a3fd0 100644
--- a/rbutil/rbutilqt/icons/players/sansaclipzip-small.png
+++ b/utils/rbutilqt/icons/players/sansaclipzip-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansaconnect-small.png b/utils/rbutilqt/icons/players/sansaconnect-small.png
index af348466ee..af348466ee 100644
--- a/rbutil/rbutilqt/icons/players/sansaconnect-small.png
+++ b/utils/rbutilqt/icons/players/sansaconnect-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansae200-small.png b/utils/rbutilqt/icons/players/sansae200-small.png
index 530456be1c..530456be1c 100644
--- a/rbutil/rbutilqt/icons/players/sansae200-small.png
+++ b/utils/rbutilqt/icons/players/sansae200-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansafuze-small.png b/utils/rbutilqt/icons/players/sansafuze-small.png
index 8cef62abc6..8cef62abc6 100644
--- a/rbutil/rbutilqt/icons/players/sansafuze-small.png
+++ b/utils/rbutilqt/icons/players/sansafuze-small.png
diff --git a/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png b/utils/rbutilqt/icons/players/sansafuzeplus-small.png
index 6d7336f1ec..6d7336f1ec 100644
--- a/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png
+++ b/utils/rbutilqt/icons/players/sansafuzeplus-small.png
diff --git a/rbutil/rbutilqt/icons/players/source-small.png b/utils/rbutilqt/icons/players/source-small.png
index 4c7cdcb426..4c7cdcb426 100644
--- a/rbutil/rbutilqt/icons/players/source-small.png
+++ b/utils/rbutilqt/icons/players/source-small.png
diff --git a/rbutil/rbutilqt/icons/players/vibe500-small.png b/utils/rbutilqt/icons/players/vibe500-small.png
index 901ac676e9..901ac676e9 100644
--- a/rbutil/rbutilqt/icons/players/vibe500-small.png
+++ b/utils/rbutilqt/icons/players/vibe500-small.png
diff --git a/rbutil/rbutilqt/icons/players/vx747-small.png b/utils/rbutilqt/icons/players/vx747-small.png
index 940babd485..940babd485 100644
--- a/rbutil/rbutilqt/icons/players/vx747-small.png
+++ b/utils/rbutilqt/icons/players/vx747-small.png
diff --git a/rbutil/rbutilqt/icons/players/vx777-small.png b/utils/rbutilqt/icons/players/vx777-small.png
index 2466b9d504..2466b9d504 100644
--- a/rbutil/rbutilqt/icons/players/vx777-small.png
+++ b/utils/rbutilqt/icons/players/vx777-small.png
diff --git a/rbutil/rbutilqt/icons/preferences-desktop-font.svg b/utils/rbutilqt/icons/preferences-desktop-font.svg
index 079398021d..079398021d 100644
--- a/rbutil/rbutilqt/icons/preferences-desktop-font.svg
+++ b/utils/rbutilqt/icons/preferences-desktop-font.svg
diff --git a/rbutil/rbutilqt/icons/preferences-desktop-locale.svg b/utils/rbutilqt/icons/preferences-desktop-locale.svg
index 2e71f18a80..2e71f18a80 100644
--- a/rbutil/rbutilqt/icons/preferences-desktop-locale.svg
+++ b/utils/rbutilqt/icons/preferences-desktop-locale.svg
diff --git a/rbutil/rbutilqt/icons/preferences-desktop-theme.svg b/utils/rbutilqt/icons/preferences-desktop-theme.svg
index 45ed886eae..45ed886eae 100644
--- a/rbutil/rbutilqt/icons/preferences-desktop-theme.svg
+++ b/utils/rbutilqt/icons/preferences-desktop-theme.svg
diff --git a/rbutil/rbutilqt/icons/preferences-system.svg b/utils/rbutilqt/icons/preferences-system.svg
index d41028fc8d..d41028fc8d 100644
--- a/rbutil/rbutilqt/icons/preferences-system.svg
+++ b/utils/rbutilqt/icons/preferences-system.svg
diff --git a/rbutil/rbutilqt/icons/process-stop.svg b/utils/rbutilqt/icons/process-stop.svg
index 04ce3a79fe..04ce3a79fe 100644
--- a/rbutil/rbutilqt/icons/process-stop.svg
+++ b/utils/rbutilqt/icons/process-stop.svg
diff --git a/rbutil/rbutilqt/icons/rbutilqt.icns b/utils/rbutilqt/icons/rbutilqt.icns
index 571ee36fcc..571ee36fcc 100644
--- a/rbutil/rbutilqt/icons/rbutilqt.icns
+++ b/utils/rbutilqt/icons/rbutilqt.icns
diff --git a/rbutil/rbutilqt/icons/rockbox.ico b/utils/rbutilqt/icons/rockbox.ico
index fa3021631b..fa3021631b 100644
--- a/rbutil/rbutilqt/icons/rockbox.ico
+++ b/utils/rbutilqt/icons/rockbox.ico
diff --git a/rbutil/rbutilqt/icons/system-installer.svg b/utils/rbutilqt/icons/system-installer.svg
index 3200740972..3200740972 100644
--- a/rbutil/rbutilqt/icons/system-installer.svg
+++ b/utils/rbutilqt/icons/system-installer.svg
diff --git a/rbutil/rbutilqt/icons/system-search.svg b/utils/rbutilqt/icons/system-search.svg
index 1a4c1cd776..1a4c1cd776 100644
--- a/rbutil/rbutilqt/icons/system-search.svg
+++ b/utils/rbutilqt/icons/system-search.svg
diff --git a/rbutil/rbutilqt/icons/user-trash-full.svg b/utils/rbutilqt/icons/user-trash-full.svg
index 393285f545..393285f545 100644
--- a/rbutil/rbutilqt/icons/user-trash-full.svg
+++ b/utils/rbutilqt/icons/user-trash-full.svg
diff --git a/rbutil/rbutilqt/icons/view-refresh.svg b/utils/rbutilqt/icons/view-refresh.svg
index 565f6dadec..565f6dadec 100644
--- a/rbutil/rbutilqt/icons/view-refresh.svg
+++ b/utils/rbutilqt/icons/view-refresh.svg
diff --git a/rbutil/rbutilqt/icons/wizard.jpg b/utils/rbutilqt/icons/wizard.jpg
index d4a9625678..d4a9625678 100644
--- a/rbutil/rbutilqt/icons/wizard.jpg
+++ b/utils/rbutilqt/icons/wizard.jpg
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/utils/rbutilqt/installtalkfrm.ui
index 7cde2b09d1..7cde2b09d1 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/utils/rbutilqt/installtalkfrm.ui
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/utils/rbutilqt/installtalkwindow.cpp
index 5499b9533c..5499b9533c 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/utils/rbutilqt/installtalkwindow.cpp
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/utils/rbutilqt/installtalkwindow.h
index f965e4cb09..f965e4cb09 100644
--- a/rbutil/rbutilqt/installtalkwindow.h
+++ b/utils/rbutilqt/installtalkwindow.h
diff --git a/rbutil/rbutilqt/irivertools/h100sums.h b/utils/rbutilqt/irivertools/h100sums.h
index d52ca0d13b..d52ca0d13b 100644
--- a/rbutil/rbutilqt/irivertools/h100sums.h
+++ b/utils/rbutilqt/irivertools/h100sums.h
diff --git a/rbutil/rbutilqt/irivertools/h120sums.h b/utils/rbutilqt/irivertools/h120sums.h
index 118b40b549..118b40b549 100644
--- a/rbutil/rbutilqt/irivertools/h120sums.h
+++ b/utils/rbutilqt/irivertools/h120sums.h
diff --git a/rbutil/rbutilqt/irivertools/h300sums.h b/utils/rbutilqt/irivertools/h300sums.h
index e4e321b0e7..e4e321b0e7 100644
--- a/rbutil/rbutilqt/irivertools/h300sums.h
+++ b/utils/rbutilqt/irivertools/h300sums.h
diff --git a/rbutil/rbutilqt/irivertools/mksums.pl b/utils/rbutilqt/irivertools/mksums.pl
index 99786fe161..99786fe161 100755
--- a/rbutil/rbutilqt/irivertools/mksums.pl
+++ b/utils/rbutilqt/irivertools/mksums.pl
diff --git a/rbutil/rbutilqt/lame/lame.h b/utils/rbutilqt/lame/lame.h
index 0550b4b61c..0550b4b61c 100644
--- a/rbutil/rbutilqt/lame/lame.h
+++ b/utils/rbutilqt/lame/lame.h
diff --git a/rbutil/rbutilqt/lang/rbutil_cs.ts b/utils/rbutilqt/lang/rbutil_cs.ts
index a6e38d2555..a6e38d2555 100644
--- a/rbutil/rbutilqt/lang/rbutil_cs.ts
+++ b/utils/rbutilqt/lang/rbutil_cs.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_de.ts b/utils/rbutilqt/lang/rbutil_de.ts
index 26ef691d3a..26ef691d3a 100644
--- a/rbutil/rbutilqt/lang/rbutil_de.ts
+++ b/utils/rbutilqt/lang/rbutil_de.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_fi.ts b/utils/rbutilqt/lang/rbutil_fi.ts
index 50a799ac4d..50a799ac4d 100644
--- a/rbutil/rbutilqt/lang/rbutil_fi.ts
+++ b/utils/rbutilqt/lang/rbutil_fi.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_fr.ts b/utils/rbutilqt/lang/rbutil_fr.ts
index f2104e1666..f2104e1666 100644
--- a/rbutil/rbutilqt/lang/rbutil_fr.ts
+++ b/utils/rbutilqt/lang/rbutil_fr.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_gr.ts b/utils/rbutilqt/lang/rbutil_gr.ts
index bfa600954b..bfa600954b 100644
--- a/rbutil/rbutilqt/lang/rbutil_gr.ts
+++ b/utils/rbutilqt/lang/rbutil_gr.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_he.ts b/utils/rbutilqt/lang/rbutil_he.ts
index 1b9854cdf6..1b9854cdf6 100644
--- a/rbutil/rbutilqt/lang/rbutil_he.ts
+++ b/utils/rbutilqt/lang/rbutil_he.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_it.ts b/utils/rbutilqt/lang/rbutil_it.ts
index 259df81d0d..259df81d0d 100644
--- a/rbutil/rbutilqt/lang/rbutil_it.ts
+++ b/utils/rbutilqt/lang/rbutil_it.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_ja.ts b/utils/rbutilqt/lang/rbutil_ja.ts
index 11a52c8754..11a52c8754 100644
--- a/rbutil/rbutilqt/lang/rbutil_ja.ts
+++ b/utils/rbutilqt/lang/rbutil_ja.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_nl.ts b/utils/rbutilqt/lang/rbutil_nl.ts
index 19123120f4..19123120f4 100644
--- a/rbutil/rbutilqt/lang/rbutil_nl.ts
+++ b/utils/rbutilqt/lang/rbutil_nl.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_pl.ts b/utils/rbutilqt/lang/rbutil_pl.ts
index 3bf1f43eef..3bf1f43eef 100644
--- a/rbutil/rbutilqt/lang/rbutil_pl.ts
+++ b/utils/rbutilqt/lang/rbutil_pl.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_pt.ts b/utils/rbutilqt/lang/rbutil_pt.ts
index 0c00d82a09..0c00d82a09 100644
--- a/rbutil/rbutilqt/lang/rbutil_pt.ts
+++ b/utils/rbutilqt/lang/rbutil_pt.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_pt_BR.ts b/utils/rbutilqt/lang/rbutil_pt_BR.ts
index c906196125..c906196125 100644
--- a/rbutil/rbutilqt/lang/rbutil_pt_BR.ts
+++ b/utils/rbutilqt/lang/rbutil_pt_BR.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_ru.ts b/utils/rbutilqt/lang/rbutil_ru.ts
index 3328065b55..3328065b55 100644
--- a/rbutil/rbutilqt/lang/rbutil_ru.ts
+++ b/utils/rbutilqt/lang/rbutil_ru.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_tr.ts b/utils/rbutilqt/lang/rbutil_tr.ts
index bb93e62ff2..bb93e62ff2 100644
--- a/rbutil/rbutilqt/lang/rbutil_tr.ts
+++ b/utils/rbutilqt/lang/rbutil_tr.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts b/utils/rbutilqt/lang/rbutil_zh_CN.ts
index 06b562abe5..06b562abe5 100644
--- a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
+++ b/utils/rbutilqt/lang/rbutil_zh_CN.ts
diff --git a/rbutil/rbutilqt/lang/rbutil_zh_TW.ts b/utils/rbutilqt/lang/rbutil_zh_TW.ts
index 96aaf40395..96aaf40395 100644
--- a/rbutil/rbutilqt/lang/rbutil_zh_TW.ts
+++ b/utils/rbutilqt/lang/rbutil_zh_TW.ts
diff --git a/rbutil/rbutilqt/langstats.py b/utils/rbutilqt/langstats.py
index cbf49dce08..cbf49dce08 100755
--- a/rbutil/rbutilqt/langstats.py
+++ b/utils/rbutilqt/langstats.py
diff --git a/rbutil/rbutilqt/logger/LICENSE.LGPL b/utils/rbutilqt/logger/LICENSE.LGPL
index 5ab7695ab8..5ab7695ab8 100644
--- a/rbutil/rbutilqt/logger/LICENSE.LGPL
+++ b/utils/rbutilqt/logger/LICENSE.LGPL
diff --git a/rbutil/rbutilqt/logger/README.ROCKBOX b/utils/rbutilqt/logger/README.ROCKBOX
index f501a410dd..f501a410dd 100644
--- a/rbutil/rbutilqt/logger/README.ROCKBOX
+++ b/utils/rbutilqt/logger/README.ROCKBOX
diff --git a/rbutil/rbutilqt/logger/include/AbstractAppender.h b/utils/rbutilqt/logger/include/AbstractAppender.h
index e029b045aa..e029b045aa 100644
--- a/rbutil/rbutilqt/logger/include/AbstractAppender.h
+++ b/utils/rbutilqt/logger/include/AbstractAppender.h
diff --git a/rbutil/rbutilqt/logger/include/AbstractStringAppender.h b/utils/rbutilqt/logger/include/AbstractStringAppender.h
index 78df9e6176..78df9e6176 100644
--- a/rbutil/rbutilqt/logger/include/AbstractStringAppender.h
+++ b/utils/rbutilqt/logger/include/AbstractStringAppender.h
diff --git a/rbutil/rbutilqt/logger/include/ConsoleAppender.h b/utils/rbutilqt/logger/include/ConsoleAppender.h
index 64ef2e7a19..64ef2e7a19 100644
--- a/rbutil/rbutilqt/logger/include/ConsoleAppender.h
+++ b/utils/rbutilqt/logger/include/ConsoleAppender.h
diff --git a/rbutil/rbutilqt/logger/include/CuteLogger_global.h b/utils/rbutilqt/logger/include/CuteLogger_global.h
index c5e7680845..c5e7680845 100644
--- a/rbutil/rbutilqt/logger/include/CuteLogger_global.h
+++ b/utils/rbutilqt/logger/include/CuteLogger_global.h
diff --git a/rbutil/rbutilqt/logger/include/FileAppender.h b/utils/rbutilqt/logger/include/FileAppender.h
index ab9e12a91d..ab9e12a91d 100644
--- a/rbutil/rbutilqt/logger/include/FileAppender.h
+++ b/utils/rbutilqt/logger/include/FileAppender.h
diff --git a/rbutil/rbutilqt/logger/include/Logger.h b/utils/rbutilqt/logger/include/Logger.h
index 941e556eb9..941e556eb9 100644
--- a/rbutil/rbutilqt/logger/include/Logger.h
+++ b/utils/rbutilqt/logger/include/Logger.h
diff --git a/rbutil/rbutilqt/logger/include/OutputDebugAppender.h b/utils/rbutilqt/logger/include/OutputDebugAppender.h
index dd7ad4deb7..dd7ad4deb7 100644
--- a/rbutil/rbutilqt/logger/include/OutputDebugAppender.h
+++ b/utils/rbutilqt/logger/include/OutputDebugAppender.h
diff --git a/rbutil/rbutilqt/logger/logger.pri b/utils/rbutilqt/logger/logger.pri
index e34bccb3cf..e34bccb3cf 100644
--- a/rbutil/rbutilqt/logger/logger.pri
+++ b/utils/rbutilqt/logger/logger.pri
diff --git a/rbutil/rbutilqt/logger/src/AbstractAppender.cpp b/utils/rbutilqt/logger/src/AbstractAppender.cpp
index 778bbddd11..778bbddd11 100644
--- a/rbutil/rbutilqt/logger/src/AbstractAppender.cpp
+++ b/utils/rbutilqt/logger/src/AbstractAppender.cpp
diff --git a/rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp b/utils/rbutilqt/logger/src/AbstractStringAppender.cpp
index ea5883f744..ea5883f744 100644
--- a/rbutil/rbutilqt/logger/src/AbstractStringAppender.cpp
+++ b/utils/rbutilqt/logger/src/AbstractStringAppender.cpp
diff --git a/rbutil/rbutilqt/logger/src/ConsoleAppender.cpp b/utils/rbutilqt/logger/src/ConsoleAppender.cpp
index 932ffab787..932ffab787 100644
--- a/rbutil/rbutilqt/logger/src/ConsoleAppender.cpp
+++ b/utils/rbutilqt/logger/src/ConsoleAppender.cpp
diff --git a/rbutil/rbutilqt/logger/src/FileAppender.cpp b/utils/rbutilqt/logger/src/FileAppender.cpp
index b9018b0324..b9018b0324 100644
--- a/rbutil/rbutilqt/logger/src/FileAppender.cpp
+++ b/utils/rbutilqt/logger/src/FileAppender.cpp
diff --git a/rbutil/rbutilqt/logger/src/Logger.cpp b/utils/rbutilqt/logger/src/Logger.cpp
index 689bc42e80..689bc42e80 100644
--- a/rbutil/rbutilqt/logger/src/Logger.cpp
+++ b/utils/rbutilqt/logger/src/Logger.cpp
diff --git a/rbutil/rbutilqt/logger/src/OutputDebugAppender.cpp b/utils/rbutilqt/logger/src/OutputDebugAppender.cpp
index 44d640512f..44d640512f 100644
--- a/rbutil/rbutilqt/logger/src/OutputDebugAppender.cpp
+++ b/utils/rbutilqt/logger/src/OutputDebugAppender.cpp
diff --git a/rbutil/rbutilqt/main.cpp b/utils/rbutilqt/main.cpp
index 47c625b54d..47c625b54d 100644
--- a/rbutil/rbutilqt/main.cpp
+++ b/utils/rbutilqt/main.cpp
diff --git a/rbutil/rbutilqt/mspack/COPYING.LIB b/utils/rbutilqt/mspack/COPYING.LIB
index b1e3f5a263..b1e3f5a263 100644
--- a/rbutil/rbutilqt/mspack/COPYING.LIB
+++ b/utils/rbutilqt/mspack/COPYING.LIB
diff --git a/rbutil/rbutilqt/mspack/README.ROCKBOX b/utils/rbutilqt/mspack/README.ROCKBOX
index 220691af2c..220691af2c 100644
--- a/rbutil/rbutilqt/mspack/README.ROCKBOX
+++ b/utils/rbutilqt/mspack/README.ROCKBOX
diff --git a/rbutil/rbutilqt/mspack/cab.h b/utils/rbutilqt/mspack/cab.h
index 79d9951252..79d9951252 100644
--- a/rbutil/rbutilqt/mspack/cab.h
+++ b/utils/rbutilqt/mspack/cab.h
diff --git a/rbutil/rbutilqt/mspack/cabc.c b/utils/rbutilqt/mspack/cabc.c
index eb85011056..eb85011056 100644
--- a/rbutil/rbutilqt/mspack/cabc.c
+++ b/utils/rbutilqt/mspack/cabc.c
diff --git a/rbutil/rbutilqt/mspack/cabd.c b/utils/rbutilqt/mspack/cabd.c
index ae66769b24..ae66769b24 100644
--- a/rbutil/rbutilqt/mspack/cabd.c
+++ b/utils/rbutilqt/mspack/cabd.c
diff --git a/rbutil/rbutilqt/mspack/chm.h b/utils/rbutilqt/mspack/chm.h
index 4b19f1505a..4b19f1505a 100644
--- a/rbutil/rbutilqt/mspack/chm.h
+++ b/utils/rbutilqt/mspack/chm.h
diff --git a/rbutil/rbutilqt/mspack/chmc.c b/utils/rbutilqt/mspack/chmc.c
index b9a1d8856c..b9a1d8856c 100644
--- a/rbutil/rbutilqt/mspack/chmc.c
+++ b/utils/rbutilqt/mspack/chmc.c
diff --git a/rbutil/rbutilqt/mspack/chmd.c b/utils/rbutilqt/mspack/chmd.c
index 6c8481db14..6c8481db14 100644
--- a/rbutil/rbutilqt/mspack/chmd.c
+++ b/utils/rbutilqt/mspack/chmd.c
diff --git a/rbutil/rbutilqt/mspack/des.h b/utils/rbutilqt/mspack/des.h
index 64a1ed27e4..64a1ed27e4 100644
--- a/rbutil/rbutilqt/mspack/des.h
+++ b/utils/rbutilqt/mspack/des.h
diff --git a/rbutil/rbutilqt/mspack/hlp.h b/utils/rbutilqt/mspack/hlp.h
index a6e3abc7ff..a6e3abc7ff 100644
--- a/rbutil/rbutilqt/mspack/hlp.h
+++ b/utils/rbutilqt/mspack/hlp.h
diff --git a/rbutil/rbutilqt/mspack/hlpc.c b/utils/rbutilqt/mspack/hlpc.c
index b33e499f65..b33e499f65 100644
--- a/rbutil/rbutilqt/mspack/hlpc.c
+++ b/utils/rbutilqt/mspack/hlpc.c
diff --git a/rbutil/rbutilqt/mspack/hlpd.c b/utils/rbutilqt/mspack/hlpd.c
index ae1f2efba8..ae1f2efba8 100644
--- a/rbutil/rbutilqt/mspack/hlpd.c
+++ b/utils/rbutilqt/mspack/hlpd.c
diff --git a/rbutil/rbutilqt/mspack/kwaj.h b/utils/rbutilqt/mspack/kwaj.h
index 75425d958a..75425d958a 100644
--- a/rbutil/rbutilqt/mspack/kwaj.h
+++ b/utils/rbutilqt/mspack/kwaj.h
diff --git a/rbutil/rbutilqt/mspack/kwajc.c b/utils/rbutilqt/mspack/kwajc.c
index 52ca29432a..52ca29432a 100644
--- a/rbutil/rbutilqt/mspack/kwajc.c
+++ b/utils/rbutilqt/mspack/kwajc.c
diff --git a/rbutil/rbutilqt/mspack/kwajd.c b/utils/rbutilqt/mspack/kwajd.c
index 24e0b0613b..24e0b0613b 100644
--- a/rbutil/rbutilqt/mspack/kwajd.c
+++ b/utils/rbutilqt/mspack/kwajd.c
diff --git a/rbutil/rbutilqt/mspack/lit.h b/utils/rbutilqt/mspack/lit.h
index 2ccc7dd7f3..2ccc7dd7f3 100644
--- a/rbutil/rbutilqt/mspack/lit.h
+++ b/utils/rbutilqt/mspack/lit.h
diff --git a/rbutil/rbutilqt/mspack/litc.c b/utils/rbutilqt/mspack/litc.c
index 4959a81d36..4959a81d36 100644
--- a/rbutil/rbutilqt/mspack/litc.c
+++ b/utils/rbutilqt/mspack/litc.c
diff --git a/rbutil/rbutilqt/mspack/litd.c b/utils/rbutilqt/mspack/litd.c
index 93cbf1765a..93cbf1765a 100644
--- a/rbutil/rbutilqt/mspack/litd.c
+++ b/utils/rbutilqt/mspack/litd.c
diff --git a/rbutil/rbutilqt/mspack/lzss.h b/utils/rbutilqt/mspack/lzss.h
index aa946e52ae..aa946e52ae 100644
--- a/rbutil/rbutilqt/mspack/lzss.h
+++ b/utils/rbutilqt/mspack/lzss.h
diff --git a/rbutil/rbutilqt/mspack/lzssd.c b/utils/rbutilqt/mspack/lzssd.c
index 63716d414a..63716d414a 100644
--- a/rbutil/rbutilqt/mspack/lzssd.c
+++ b/utils/rbutilqt/mspack/lzssd.c
diff --git a/rbutil/rbutilqt/mspack/lzx.h b/utils/rbutilqt/mspack/lzx.h
index a6152f622b..a6152f622b 100644
--- a/rbutil/rbutilqt/mspack/lzx.h
+++ b/utils/rbutilqt/mspack/lzx.h
diff --git a/rbutil/rbutilqt/mspack/lzxc.c b/utils/rbutilqt/mspack/lzxc.c
index 89d8c610ea..89d8c610ea 100644
--- a/rbutil/rbutilqt/mspack/lzxc.c
+++ b/utils/rbutilqt/mspack/lzxc.c
diff --git a/rbutil/rbutilqt/mspack/lzxd.c b/utils/rbutilqt/mspack/lzxd.c
index 88cfd90c2a..88cfd90c2a 100644
--- a/rbutil/rbutilqt/mspack/lzxd.c
+++ b/utils/rbutilqt/mspack/lzxd.c
diff --git a/rbutil/rbutilqt/mspack/mspack.h b/utils/rbutilqt/mspack/mspack.h
index 3e99624463..3e99624463 100644
--- a/rbutil/rbutilqt/mspack/mspack.h
+++ b/utils/rbutilqt/mspack/mspack.h
diff --git a/rbutil/rbutilqt/mspack/mszip.h b/utils/rbutilqt/mspack/mszip.h
index 2cd608234e..2cd608234e 100644
--- a/rbutil/rbutilqt/mspack/mszip.h
+++ b/utils/rbutilqt/mspack/mszip.h
diff --git a/rbutil/rbutilqt/mspack/mszipc.c b/utils/rbutilqt/mspack/mszipc.c
index 2f14b9ac83..2f14b9ac83 100644
--- a/rbutil/rbutilqt/mspack/mszipc.c
+++ b/utils/rbutilqt/mspack/mszipc.c
diff --git a/rbutil/rbutilqt/mspack/mszipd.c b/utils/rbutilqt/mspack/mszipd.c
index c1b02b1207..c1b02b1207 100644
--- a/rbutil/rbutilqt/mspack/mszipd.c
+++ b/utils/rbutilqt/mspack/mszipd.c
diff --git a/rbutil/rbutilqt/mspack/qtm.h b/utils/rbutilqt/mspack/qtm.h
index 20a38538a2..20a38538a2 100644
--- a/rbutil/rbutilqt/mspack/qtm.h
+++ b/utils/rbutilqt/mspack/qtm.h
diff --git a/rbutil/rbutilqt/mspack/qtmd.c b/utils/rbutilqt/mspack/qtmd.c
index 58e4787b7f..58e4787b7f 100644
--- a/rbutil/rbutilqt/mspack/qtmd.c
+++ b/utils/rbutilqt/mspack/qtmd.c
diff --git a/rbutil/rbutilqt/mspack/readbits.h b/utils/rbutilqt/mspack/readbits.h
index 9b237a3693..9b237a3693 100644
--- a/rbutil/rbutilqt/mspack/readbits.h
+++ b/utils/rbutilqt/mspack/readbits.h
diff --git a/rbutil/rbutilqt/mspack/readhuff.h b/utils/rbutilqt/mspack/readhuff.h
index 4d94225789..4d94225789 100644
--- a/rbutil/rbutilqt/mspack/readhuff.h
+++ b/utils/rbutilqt/mspack/readhuff.h
diff --git a/rbutil/rbutilqt/mspack/sha.h b/utils/rbutilqt/mspack/sha.h
index 360521519b..360521519b 100644
--- a/rbutil/rbutilqt/mspack/sha.h
+++ b/utils/rbutilqt/mspack/sha.h
diff --git a/rbutil/rbutilqt/mspack/system-mspack.c b/utils/rbutilqt/mspack/system-mspack.c
index 9d4886a8db..9d4886a8db 100644
--- a/rbutil/rbutilqt/mspack/system-mspack.c
+++ b/utils/rbutilqt/mspack/system-mspack.c
diff --git a/rbutil/rbutilqt/mspack/system-mspack.h b/utils/rbutilqt/mspack/system-mspack.h
index a0e6cf3ca8..a0e6cf3ca8 100644
--- a/rbutil/rbutilqt/mspack/system-mspack.h
+++ b/utils/rbutilqt/mspack/system-mspack.h
diff --git a/rbutil/rbutilqt/mspack/szdd.h b/utils/rbutilqt/mspack/szdd.h
index b9936b42d1..b9936b42d1 100644
--- a/rbutil/rbutilqt/mspack/szdd.h
+++ b/utils/rbutilqt/mspack/szdd.h
diff --git a/rbutil/rbutilqt/mspack/szddc.c b/utils/rbutilqt/mspack/szddc.c
index 6ad6501217..6ad6501217 100644
--- a/rbutil/rbutilqt/mspack/szddc.c
+++ b/utils/rbutilqt/mspack/szddc.c
diff --git a/rbutil/rbutilqt/mspack/szddd.c b/utils/rbutilqt/mspack/szddd.c
index 1d6d05f844..1d6d05f844 100644
--- a/rbutil/rbutilqt/mspack/szddd.c
+++ b/utils/rbutilqt/mspack/szddd.c
diff --git a/rbutil/rbutilqt/msvc/Makefile b/utils/rbutilqt/msvc/Makefile
index 014e7c87a2..014e7c87a2 100644
--- a/rbutil/rbutilqt/msvc/Makefile
+++ b/utils/rbutilqt/msvc/Makefile
diff --git a/rbutil/rbutilqt/msvc/README b/utils/rbutilqt/msvc/README
index eedec271a1..eedec271a1 100644
--- a/rbutil/rbutilqt/msvc/README
+++ b/utils/rbutilqt/msvc/README
diff --git a/rbutil/rbutilqt/msvc/inttypes.h b/utils/rbutilqt/msvc/inttypes.h
index 4b3828a216..4b3828a216 100644
--- a/rbutil/rbutilqt/msvc/inttypes.h
+++ b/utils/rbutilqt/msvc/inttypes.h
diff --git a/rbutil/rbutilqt/msvc/stdbool.h b/utils/rbutilqt/msvc/stdbool.h
index e44a1f9a97..e44a1f9a97 100644
--- a/rbutil/rbutilqt/msvc/stdbool.h
+++ b/utils/rbutilqt/msvc/stdbool.h
diff --git a/rbutil/rbutilqt/msvc/stdint.h b/utils/rbutilqt/msvc/stdint.h
index d02608a597..d02608a597 100644
--- a/rbutil/rbutilqt/msvc/stdint.h
+++ b/utils/rbutilqt/msvc/stdint.h
diff --git a/rbutil/rbutilqt/preview.cpp b/utils/rbutilqt/preview.cpp
index 5006a03a09..5006a03a09 100644
--- a/rbutil/rbutilqt/preview.cpp
+++ b/utils/rbutilqt/preview.cpp
diff --git a/rbutil/rbutilqt/preview.h b/utils/rbutilqt/preview.h
index 7462413f0a..7462413f0a 100644
--- a/rbutil/rbutilqt/preview.h
+++ b/utils/rbutilqt/preview.h
diff --git a/rbutil/rbutilqt/previewfrm.ui b/utils/rbutilqt/previewfrm.ui
index 359887bfed..359887bfed 100644
--- a/rbutil/rbutilqt/previewfrm.ui
+++ b/utils/rbutilqt/previewfrm.ui
diff --git a/rbutil/rbutilqt/progressloggerfrm.ui b/utils/rbutilqt/progressloggerfrm.ui
index 0fa6b79269..0fa6b79269 100644
--- a/rbutil/rbutilqt/progressloggerfrm.ui
+++ b/utils/rbutilqt/progressloggerfrm.ui
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/utils/rbutilqt/progressloggergui.cpp
index 37e0908ae0..37e0908ae0 100644
--- a/rbutil/rbutilqt/progressloggergui.cpp
+++ b/utils/rbutilqt/progressloggergui.cpp
diff --git a/rbutil/rbutilqt/progressloggergui.h b/utils/rbutilqt/progressloggergui.h
index ce9a8c9fa7..ce9a8c9fa7 100644
--- a/rbutil/rbutilqt/progressloggergui.h
+++ b/utils/rbutilqt/progressloggergui.h
diff --git a/rbutil/rbutilqt/quazip/LICENSE.LGPL b/utils/rbutilqt/quazip/LICENSE.LGPL
index 2cba2ac74c..2cba2ac74c 100644
--- a/rbutil/rbutilqt/quazip/LICENSE.LGPL
+++ b/utils/rbutilqt/quazip/LICENSE.LGPL
diff --git a/rbutil/rbutilqt/quazip/README.ROCKBOX b/utils/rbutilqt/quazip/README.ROCKBOX
index a168b2a079..a168b2a079 100644
--- a/rbutil/rbutilqt/quazip/README.ROCKBOX
+++ b/utils/rbutilqt/quazip/README.ROCKBOX
diff --git a/rbutil/rbutilqt/quazip/ioapi.h b/utils/rbutilqt/quazip/ioapi.h
index 75d0aa6933..75d0aa6933 100644
--- a/rbutil/rbutilqt/quazip/ioapi.h
+++ b/utils/rbutilqt/quazip/ioapi.h
diff --git a/rbutil/rbutilqt/quazip/minizip_crypt.h b/utils/rbutilqt/quazip/minizip_crypt.h
index 2e833f7f3c..2e833f7f3c 100644
--- a/rbutil/rbutilqt/quazip/minizip_crypt.h
+++ b/utils/rbutilqt/quazip/minizip_crypt.h
diff --git a/rbutil/rbutilqt/quazip/qioapi.cpp b/utils/rbutilqt/quazip/qioapi.cpp
index 3932ebeef0..3932ebeef0 100644
--- a/rbutil/rbutilqt/quazip/qioapi.cpp
+++ b/utils/rbutilqt/quazip/qioapi.cpp
diff --git a/rbutil/rbutilqt/quazip/quazip.cpp b/utils/rbutilqt/quazip/quazip.cpp
index 61c2ea87eb..61c2ea87eb 100644
--- a/rbutil/rbutilqt/quazip/quazip.cpp
+++ b/utils/rbutilqt/quazip/quazip.cpp
diff --git a/rbutil/rbutilqt/quazip/quazip.h b/utils/rbutilqt/quazip/quazip.h
index 8ff0756254..8ff0756254 100644
--- a/rbutil/rbutilqt/quazip/quazip.h
+++ b/utils/rbutilqt/quazip/quazip.h
diff --git a/rbutil/rbutilqt/quazip/quazip.pri b/utils/rbutilqt/quazip/quazip.pri
index 3a82bd0275..3a82bd0275 100644
--- a/rbutil/rbutilqt/quazip/quazip.pri
+++ b/utils/rbutilqt/quazip/quazip.pri
diff --git a/rbutil/rbutilqt/quazip/quazip_global.h b/utils/rbutilqt/quazip/quazip_global.h
index de581bd7c4..de581bd7c4 100644
--- a/rbutil/rbutilqt/quazip/quazip_global.h
+++ b/utils/rbutilqt/quazip/quazip_global.h
diff --git a/rbutil/rbutilqt/quazip/quazipfile.cpp b/utils/rbutilqt/quazip/quazipfile.cpp
index b984de7279..b984de7279 100644
--- a/rbutil/rbutilqt/quazip/quazipfile.cpp
+++ b/utils/rbutilqt/quazip/quazipfile.cpp
diff --git a/rbutil/rbutilqt/quazip/quazipfile.h b/utils/rbutilqt/quazip/quazipfile.h
index 0fd6829f36..0fd6829f36 100644
--- a/rbutil/rbutilqt/quazip/quazipfile.h
+++ b/utils/rbutilqt/quazip/quazipfile.h
diff --git a/rbutil/rbutilqt/quazip/quazipfileinfo.cpp b/utils/rbutilqt/quazip/quazipfileinfo.cpp
index d5798ea771..d5798ea771 100644
--- a/rbutil/rbutilqt/quazip/quazipfileinfo.cpp
+++ b/utils/rbutilqt/quazip/quazipfileinfo.cpp
diff --git a/rbutil/rbutilqt/quazip/quazipfileinfo.h b/utils/rbutilqt/quazip/quazipfileinfo.h
index 43665b4ac2..43665b4ac2 100644
--- a/rbutil/rbutilqt/quazip/quazipfileinfo.h
+++ b/utils/rbutilqt/quazip/quazipfileinfo.h
diff --git a/rbutil/rbutilqt/quazip/quazipnewinfo.cpp b/utils/rbutilqt/quazip/quazipnewinfo.cpp
index 98630e086a..98630e086a 100644
--- a/rbutil/rbutilqt/quazip/quazipnewinfo.cpp
+++ b/utils/rbutilqt/quazip/quazipnewinfo.cpp
diff --git a/rbutil/rbutilqt/quazip/quazipnewinfo.h b/utils/rbutilqt/quazip/quazipnewinfo.h
index 43a1e6fd08..43a1e6fd08 100644
--- a/rbutil/rbutilqt/quazip/quazipnewinfo.h
+++ b/utils/rbutilqt/quazip/quazipnewinfo.h
diff --git a/rbutil/rbutilqt/quazip/unzip.c b/utils/rbutilqt/quazip/unzip.c
index 6aaeba6930..6aaeba6930 100644
--- a/rbutil/rbutilqt/quazip/unzip.c
+++ b/utils/rbutilqt/quazip/unzip.c
diff --git a/rbutil/rbutilqt/quazip/unzip.h b/utils/rbutilqt/quazip/unzip.h
index fdefa2217a..fdefa2217a 100644
--- a/rbutil/rbutilqt/quazip/unzip.h
+++ b/utils/rbutilqt/quazip/unzip.h
diff --git a/rbutil/rbutilqt/quazip/zip.c b/utils/rbutilqt/quazip/zip.c
index 0f3deb04c1..0f3deb04c1 100644
--- a/rbutil/rbutilqt/quazip/zip.c
+++ b/utils/rbutilqt/quazip/zip.c
diff --git a/rbutil/rbutilqt/quazip/zip.h b/utils/rbutilqt/quazip/zip.h
index 114a1bf6e7..114a1bf6e7 100644
--- a/rbutil/rbutilqt/quazip/zip.h
+++ b/utils/rbutilqt/quazip/zip.h
diff --git a/rbutil/rbutilqt/rbutil.ini b/utils/rbutilqt/rbutil.ini
index ff074ff38e..ff074ff38e 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/utils/rbutilqt/rbutil.ini
diff --git a/rbutil/rbutilqt/rbutilqt-lang.qrc b/utils/rbutilqt/rbutilqt-lang.qrc
index df6e2f98c7..df6e2f98c7 100644
--- a/rbutil/rbutilqt/rbutilqt-lang.qrc
+++ b/utils/rbutilqt/rbutilqt-lang.qrc
diff --git a/rbutil/rbutilqt/rbutilqt-win.qrc b/utils/rbutilqt/rbutilqt-win.qrc
index 470b99a7ee..470b99a7ee 100644
--- a/rbutil/rbutilqt/rbutilqt-win.qrc
+++ b/utils/rbutilqt/rbutilqt-win.qrc
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp
index 16735dc83a..16735dc83a 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/utils/rbutilqt/rbutilqt.cpp
diff --git a/rbutil/rbutilqt/rbutilqt.h b/utils/rbutilqt/rbutilqt.h
index e20749d438..e20749d438 100644
--- a/rbutil/rbutilqt/rbutilqt.h
+++ b/utils/rbutilqt/rbutilqt.h
diff --git a/rbutil/rbutilqt/rbutilqt.manifest b/utils/rbutilqt/rbutilqt.manifest
index 27586d99dd..27586d99dd 100644
--- a/rbutil/rbutilqt/rbutilqt.manifest
+++ b/utils/rbutilqt/rbutilqt.manifest
diff --git a/rbutil/rbutilqt/rbutilqt.pri b/utils/rbutilqt/rbutilqt.pri
index 15d415289f..15d415289f 100644
--- a/rbutil/rbutilqt/rbutilqt.pri
+++ b/utils/rbutilqt/rbutilqt.pri
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/utils/rbutilqt/rbutilqt.pro
index 044ff95237..f172e231bf 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/utils/rbutilqt/rbutilqt.pro
@@ -61,7 +61,7 @@ contains(QT_MAJOR_VERSION, 4) {
 }
 
 RBBASE_DIR = $$_PRO_FILE_PWD_
-RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
+RBBASE_DIR = $$replace(RBBASE_DIR,/utils/rbutilqt,)
 
 message("using Rockbox basedir $$RBBASE_DIR")
 
@@ -80,7 +80,7 @@ message("using Rockbox basedir $$RBBASE_DIR")
 }
 
 extralibs.commands = $$SILENT \
-        $(MAKE) -f $$RBBASE_DIR/rbutil/rbutilqt/Makefile.libs \
+        $(MAKE) -f $$RBBASE_DIR/utils/rbutilqt/Makefile.libs \
         $$VERBOSE \
         SYS_SPEEX=\"$$LIBSPEEX\" \
         BUILD_DIR=$$MYLIBBUILDDIR/ \
@@ -133,7 +133,7 @@ exists($$LRELEASE) {
 INCLUDEPATH += $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \
             $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/base \
             $$_PRO_FILE_PWD_/zlib $$_PRO_FILE_PWD_/gui
-INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher \
+INCLUDEPATH += $$RBBASE_DIR/utils/ipodpatcher $$RBBASE_DIR/utils/sansapatcher \
             $$RBBASE_DIR/tools/rbspeex $$RBBASE_DIR/tools
 INCLUDEPATH += logger
 
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/utils/rbutilqt/rbutilqt.qrc
index 7ea638c54b..7ea638c54b 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/utils/rbutilqt/rbutilqt.qrc
diff --git a/rbutil/rbutilqt/rbutilqt.rc b/utils/rbutilqt/rbutilqt.rc
index 8ffe2b2424..8ffe2b2424 100644
--- a/rbutil/rbutilqt/rbutilqt.rc
+++ b/utils/rbutilqt/rbutilqt.rc
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/utils/rbutilqt/rbutilqtfrm.ui
index af47fea72c..af47fea72c 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/utils/rbutilqt/rbutilqtfrm.ui
diff --git a/rbutil/rbutilqt/sysinfo.cpp b/utils/rbutilqt/sysinfo.cpp
index 7d05bb8c9a..7d05bb8c9a 100644
--- a/rbutil/rbutilqt/sysinfo.cpp
+++ b/utils/rbutilqt/sysinfo.cpp
diff --git a/rbutil/rbutilqt/sysinfo.h b/utils/rbutilqt/sysinfo.h
index 3211151bf0..3211151bf0 100644
--- a/rbutil/rbutilqt/sysinfo.h
+++ b/utils/rbutilqt/sysinfo.h
diff --git a/rbutil/rbutilqt/sysinfofrm.ui b/utils/rbutilqt/sysinfofrm.ui
index 82fb5daa22..82fb5daa22 100644
--- a/rbutil/rbutilqt/sysinfofrm.ui
+++ b/utils/rbutilqt/sysinfofrm.ui
diff --git a/rbutil/rbutilqt/systrace.cpp b/utils/rbutilqt/systrace.cpp
index a20056b508..a20056b508 100644
--- a/rbutil/rbutilqt/systrace.cpp
+++ b/utils/rbutilqt/systrace.cpp
diff --git a/rbutil/rbutilqt/systrace.h b/utils/rbutilqt/systrace.h
index b0a6f70fa6..b0a6f70fa6 100644
--- a/rbutil/rbutilqt/systrace.h
+++ b/utils/rbutilqt/systrace.h
diff --git a/rbutil/rbutilqt/systracefrm.ui b/utils/rbutilqt/systracefrm.ui
index 6452c852ff..6452c852ff 100644
--- a/rbutil/rbutilqt/systracefrm.ui
+++ b/utils/rbutilqt/systracefrm.ui
diff --git a/rbutil/rbutilqt/test/stubs/Logger.h b/utils/rbutilqt/test/stubs/Logger.h
index 6640646b24..6640646b24 100644
--- a/rbutil/rbutilqt/test/stubs/Logger.h
+++ b/utils/rbutilqt/test/stubs/Logger.h
diff --git a/rbutil/rbutilqt/test/stubs/stubs-compareversion.cpp b/utils/rbutilqt/test/stubs/stubs-compareversion.cpp
index 07e2d18f19..07e2d18f19 100644
--- a/rbutil/rbutilqt/test/stubs/stubs-compareversion.cpp
+++ b/utils/rbutilqt/test/stubs/stubs-compareversion.cpp
diff --git a/rbutil/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp b/utils/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp
index 8856645e89..8856645e89 100644
--- a/rbutil/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp
+++ b/utils/rbutilqt/test/stubs/stubs-playerbuildinfo.cpp
diff --git a/rbutil/rbutilqt/test/test-compareversion.cpp b/utils/rbutilqt/test/test-compareversion.cpp
index 94d7697646..94d7697646 100644
--- a/rbutil/rbutilqt/test/test-compareversion.cpp
+++ b/utils/rbutilqt/test/test-compareversion.cpp
diff --git a/rbutil/rbutilqt/test/test-compareversion.pro b/utils/rbutilqt/test/test-compareversion.pro
index c8e5a899ac..c8e5a899ac 100644
--- a/rbutil/rbutilqt/test/test-compareversion.pro
+++ b/utils/rbutilqt/test/test-compareversion.pro
diff --git a/rbutil/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp
index 144adc62df..144adc62df 100644
--- a/rbutil/rbutilqt/test/test-httpget.cpp
+++ b/utils/rbutilqt/test/test-httpget.cpp
diff --git a/rbutil/rbutilqt/test/test-httpget.pro b/utils/rbutilqt/test/test-httpget.pro
index 3189ad2266..3189ad2266 100644
--- a/rbutil/rbutilqt/test/test-httpget.pro
+++ b/utils/rbutilqt/test/test-httpget.pro
diff --git a/rbutil/rbutilqt/test/test-playerbuildinfo.cpp b/utils/rbutilqt/test/test-playerbuildinfo.cpp
index a250e37979..a250e37979 100644
--- a/rbutil/rbutilqt/test/test-playerbuildinfo.cpp
+++ b/utils/rbutilqt/test/test-playerbuildinfo.cpp
diff --git a/rbutil/rbutilqt/test/test-playerbuildinfo.pro b/utils/rbutilqt/test/test-playerbuildinfo.pro
index 724da59162..724da59162 100644
--- a/rbutil/rbutilqt/test/test-playerbuildinfo.pro
+++ b/utils/rbutilqt/test/test-playerbuildinfo.pro
diff --git a/rbutil/rbutilqt/test/test-rockboxinfo.cpp b/utils/rbutilqt/test/test-rockboxinfo.cpp
index 9d2b53b3ab..9d2b53b3ab 100644
--- a/rbutil/rbutilqt/test/test-rockboxinfo.cpp
+++ b/utils/rbutilqt/test/test-rockboxinfo.cpp
diff --git a/rbutil/rbutilqt/test/test-rockboxinfo.pro b/utils/rbutilqt/test/test-rockboxinfo.pro
index 88bc83a5b7..88bc83a5b7 100644
--- a/rbutil/rbutilqt/test/test-rockboxinfo.pro
+++ b/utils/rbutilqt/test/test-rockboxinfo.pro
diff --git a/rbutil/rbutilqt/test/tests.pri b/utils/rbutilqt/test/tests.pri
index 7dc6ffda7b..7dc6ffda7b 100644
--- a/rbutil/rbutilqt/test/tests.pri
+++ b/utils/rbutilqt/test/tests.pri
diff --git a/rbutil/rbutilqt/themesinstallfrm.ui b/utils/rbutilqt/themesinstallfrm.ui
index b3795febdc..b3795febdc 100644
--- a/rbutil/rbutilqt/themesinstallfrm.ui
+++ b/utils/rbutilqt/themesinstallfrm.ui
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp
index c1a54feb74..c1a54feb74 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/utils/rbutilqt/themesinstallwindow.cpp
diff --git a/rbutil/rbutilqt/themesinstallwindow.h b/utils/rbutilqt/themesinstallwindow.h
index 9214e5ccbf..9214e5ccbf 100644
--- a/rbutil/rbutilqt/themesinstallwindow.h
+++ b/utils/rbutilqt/themesinstallwindow.h
diff --git a/rbutil/rbutilqt/uninstallfrm.ui b/utils/rbutilqt/uninstallfrm.ui
index 7b72b44e1e..7b72b44e1e 100644
--- a/rbutil/rbutilqt/uninstallfrm.ui
+++ b/utils/rbutilqt/uninstallfrm.ui
diff --git a/rbutil/rbutilqt/uninstallwindow.cpp b/utils/rbutilqt/uninstallwindow.cpp
index 264b73f544..264b73f544 100644
--- a/rbutil/rbutilqt/uninstallwindow.cpp
+++ b/utils/rbutilqt/uninstallwindow.cpp
diff --git a/rbutil/rbutilqt/uninstallwindow.h b/utils/rbutilqt/uninstallwindow.h
index 74e149aa02..74e149aa02 100644
--- a/rbutil/rbutilqt/uninstallwindow.h
+++ b/utils/rbutilqt/uninstallwindow.h
diff --git a/rbutil/rbutilqt/version.h b/utils/rbutilqt/version.h
index b2d24d369b..b2d24d369b 100644
--- a/rbutil/rbutilqt/version.h
+++ b/utils/rbutilqt/version.h
diff --git a/rbutil/rbutilqt/zlib/zconf.h b/utils/rbutilqt/zlib/zconf.h
index 3c21403fce..3c21403fce 100644
--- a/rbutil/rbutilqt/zlib/zconf.h
+++ b/utils/rbutilqt/zlib/zconf.h
diff --git a/rbutil/rbutilqt/zlib/zlib.h b/utils/rbutilqt/zlib/zlib.h
index b4ddd34395..b4ddd34395 100644
--- a/rbutil/rbutilqt/zlib/zlib.h
+++ b/utils/rbutilqt/zlib/zlib.h
diff --git a/rbutil/sansapatcher/Makefile b/utils/sansapatcher/Makefile
index 85c36c6d14..85c36c6d14 100644
--- a/rbutil/sansapatcher/Makefile
+++ b/utils/sansapatcher/Makefile
diff --git a/rbutil/sansapatcher/README b/utils/sansapatcher/README
index c62f676110..c62f676110 100644
--- a/rbutil/sansapatcher/README
+++ b/utils/sansapatcher/README
diff --git a/rbutil/sansapatcher/main.c b/utils/sansapatcher/main.c
index d12e33c22b..d12e33c22b 100644
--- a/rbutil/sansapatcher/main.c
+++ b/utils/sansapatcher/main.c
diff --git a/rbutil/sansapatcher/parttypes.h b/utils/sansapatcher/parttypes.h
index f8de303553..f8de303553 100644
--- a/rbutil/sansapatcher/parttypes.h
+++ b/utils/sansapatcher/parttypes.h
diff --git a/rbutil/sansapatcher/sansaio-posix.c b/utils/sansapatcher/sansaio-posix.c
index 44c4dcc95c..44c4dcc95c 100644
--- a/rbutil/sansapatcher/sansaio-posix.c
+++ b/utils/sansapatcher/sansaio-posix.c
diff --git a/rbutil/sansapatcher/sansaio-win32.c b/utils/sansapatcher/sansaio-win32.c
index ee6a8cd93d..ee6a8cd93d 100644
--- a/rbutil/sansapatcher/sansaio-win32.c
+++ b/utils/sansapatcher/sansaio-win32.c
diff --git a/rbutil/sansapatcher/sansaio.h b/utils/sansapatcher/sansaio.h
index 61e2f1d1b2..61e2f1d1b2 100644
--- a/rbutil/sansapatcher/sansaio.h
+++ b/utils/sansapatcher/sansaio.h
diff --git a/rbutil/sansapatcher/sansapatcher.c b/utils/sansapatcher/sansapatcher.c
index e3b105dcca..e3b105dcca 100644
--- a/rbutil/sansapatcher/sansapatcher.c
+++ b/utils/sansapatcher/sansapatcher.c
diff --git a/rbutil/sansapatcher/sansapatcher.h b/utils/sansapatcher/sansapatcher.h
index 259143e38a..259143e38a 100644
--- a/rbutil/sansapatcher/sansapatcher.h
+++ b/utils/sansapatcher/sansapatcher.h
diff --git a/rbutil/sansapatcher/sansapatcher.manifest b/utils/sansapatcher/sansapatcher.manifest
index 71bb153688..71bb153688 100644
--- a/rbutil/sansapatcher/sansapatcher.manifest
+++ b/utils/sansapatcher/sansapatcher.manifest
diff --git a/rbutil/sansapatcher/sansapatcher.pro b/utils/sansapatcher/sansapatcher.pro
index f8308e6283..f8308e6283 100644
--- a/rbutil/sansapatcher/sansapatcher.pro
+++ b/utils/sansapatcher/sansapatcher.pro
diff --git a/rbutil/sansapatcher/sansapatcher.rc b/utils/sansapatcher/sansapatcher.rc
index 26bb8fe730..26bb8fe730 100644
--- a/rbutil/sansapatcher/sansapatcher.rc
+++ b/utils/sansapatcher/sansapatcher.rc
diff --git a/rbutil/tools/Makefile b/utils/tools/Makefile
index d10e2528bf..d10e2528bf 100644
--- a/rbutil/tools/Makefile
+++ b/utils/tools/Makefile
diff --git a/rbutil/tools/bin2c.c b/utils/tools/bin2c.c
index 4600746d52..4600746d52 100644
--- a/rbutil/tools/bin2c.c
+++ b/utils/tools/bin2c.c