diff --git a/install-wrappers.sh b/install-wrappers.sh
index bfa0909..91ad6ce 100755
--- a/install-wrappers.sh
+++ b/install-wrappers.sh
@@ -70,7 +70,6 @@ if [ -n "$HOST" ]; then
 fi
 $CC wrappers/clang-target-wrapper.c -o "$PREFIX/bin/clang-target-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
 $CC wrappers/dlltool-wrapper.c -o "$PREFIX/bin/dlltool-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
-$CC wrappers/windres-wrapper.c -o "$PREFIX/bin/windres-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
 $CC wrappers/llvm-wrapper.c -o "$PREFIX/bin/llvm-wrapper$EXEEXT" -O2 -Wl,-s $WRAPPER_FLAGS
 if [ -n "$EXEEXT" ]; then
     # For Windows, we should prefer the executable wrapper, which also works
@@ -94,13 +93,9 @@ for arch in $ARCHS; do
             fi
             ln -sf $link_target$EXEEXT $arch-w64-$target_os-$exec$EXEEXT || true
         done
-        if [ -f "llvm-windres$EXEEXT" ]; then
-            # windres can't use llvm-wrapper, as that loses the original
-            # target arch prefix.
-            ln -sf llvm-windres$EXEEXT $arch-w64-$target_os-windres$EXEEXT
-        else
-            ln -sf windres-wrapper$EXEEXT $arch-w64-$target_os-windres$EXEEXT
-        fi
+        # windres can't use llvm-wrapper, as that loses the original
+        # target arch prefix.
+        ln -sf llvm-windres$EXEEXT $arch-w64-$target_os-windres$EXEEXT
         ln -sf dlltool-wrapper$EXEEXT $arch-w64-$target_os-dlltool$EXEEXT
         for exec in ld objdump; do
             ln -sf $exec-wrapper.sh $arch-w64-$target_os-$exec
diff --git a/wrappers/windres-wrapper.c b/wrappers/windres-wrapper.c
deleted file mode 100644
index f22daae..0000000
--- a/wrappers/windres-wrapper.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Copyright (c) 2018 Josh de Kock <josh@itanimul.li>
- * Copyright (c) 2018 Martin Storsjo <martin@martin.st>
- *
- * This file is part of llvm-mingw.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "native-wrapper.h"
-
-#ifndef DEFAULT_TARGET
-#define DEFAULT_TARGET "x86_64-w64-mingw32"
-#endif
-
-#include <stdarg.h>
-
-#ifdef _WIN32
-#else
-#define _tspawnvp_escape _spawnvp
-
-#include <sys/wait.h>
-#include <errno.h>
-#include <limits.h>
-
-#define _P_WAIT 0
-static int _spawnvp(int mode, const char *filename, const char * const *argv) {
-    pid_t pid;
-    if (!(pid = fork())) {
-        execvp(filename, (char **) argv);
-        perror(filename);
-        exit(1);
-    }
-    int stat = 0;
-    if (waitpid(pid, &stat, 0) == -1)
-        return -1;
-    if (WIFEXITED(stat))
-        return WEXITSTATUS(stat);
-    errno = EIO;
-    return -1;
-}
-#endif
-
-// GNU binutils windres seem to require an extra level of escaping of
-// -D options to the preprocessor, which we need to undo here.
-// For defines that produce quoted strings, this windres frontend is
-// called with parameters like this: -DSTRING=\\\"1.2.3\\\"
-static const TCHAR *unescape_cpp(const TCHAR *str) {
-    TCHAR *out = _tcsdup(str);
-    int len = _tcslen(str);
-    int i, outpos = 0;
-    for (i = 0; i < len - 1; i++) {
-        if (str[i] == '\\' && str[i + 1] == '"')
-            continue;
-        out[outpos++] = str[i];
-    }
-    while (i < len)
-        out[outpos++] = str[i++];
-    out[outpos++] = '\0';
-    return out;
-}
-
-static int split_args(const TCHAR *str, const TCHAR **args, int *num_args, int max_args) {
-    int len = _tcslen(str);
-    TCHAR *out = _tcsdup(str);
-    int i, outpos = 0;
-    int arg = num_args ? *num_args : 0;
-    int inquote = 0;
-    if (!args)
-        max_args = INT_MAX;
-    for (i = 0; i < len; i++) {
-        if (str[i] == '\\') {
-            if (i + 1 < len)
-                out[outpos++] = str[++i];
-            else
-                fprintf(stderr, "Unterminated escape\n");
-            continue;
-        }
-        if (str[i] == '"') {
-            inquote = !inquote;
-            continue;
-        }
-        if (str[i] == ' ' && !inquote) {
-            out[outpos++] = '\0';
-            if (arg < max_args) {
-                if (args)
-                    args[arg] = _tcsdup(out);
-                arg++;
-            } else
-                fprintf(stderr, "Too many options split\n");
-            outpos = 0;
-            continue;
-        }
-        out[outpos++] = str[i];
-    }
-    if (inquote)
-        fprintf(stderr, "Unterminated quote\n");
-    if (outpos > 0) {
-        out[outpos++] = '\0';
-        if (arg < max_args) {
-            if (args)
-                args[arg] = _tcsdup(out);
-            arg++;
-        } else
-            fprintf(stderr, "Too many options split\n");
-    }
-    if (num_args) {
-        *num_args = arg;
-        arg -= *num_args;
-    }
-    return arg;
-}
-
-static void print_version(void) {
-    printf(
-"version: LLVM windres (GNU windres compatible) 0.1\n"
-    );
-    exit(0);
-}
-
-static void print_help(void) {
-    printf(
-"usage: llvm-windres <OPTION> [INPUT-FILE] [OUTPUT-FILE]\n"
-"\n"
-"LLVM Tool to manipulate Windows resources with a GNU windres interface.\n"
-"\n"
-"Options:\n"
-"  -i, --input <arg>          Name of the input file.\n"
-"  -o, --output <arg>         Name of the output file.\n"
-"  -J, --input-format <arg>   Input format to read.\n"
-"  -O, --output-format <arg>  Output format to generate.\n"
-"  --preprocessor <arg>       Custom preprocessor command.\n"
-"  --preprocessor-arg <arg>   Preprocessor command arguments.\n"
-"  -F, --target <arg>         Target for COFF objects to be compiled for.\n"
-"  -I, --include-dir <arg>    Include directory to pass to preprocessor and resource compiler.\n"
-"  -D, --define <arg[=val]>   Define to pass to preprocessor.\n"
-"  -U, --undefine <arg[=val]> Undefine to pass to preprocessor.\n"
-"  -c, --codepage <arg>       Default codepage to use when reading an rc file (0x0-0xffff).\n"
-"  -l, --language <arg>       Specify default language (0x0-0xffff).\n"
-"      --use-temp-file        Use a temporary file for the preprocessing output.\n"
-"  -v, --verbose              Enable verbose output.\n"
-"  -V, --version              Display version.\n"
-"  -h, --help                 Display this message and exit.\n"
-"Input Formats:\n"
-"  rc                         Text Windows Resource\n"
-"  res                        Binary Windows Resource\n"
-"Output Formats:\n"
-"  res                        Binary Windows Resource\n"
-"  coff                       COFF object\n"
-"Targets:\n"
-"  pe-x86-64\n"
-"  pei-x86-64\n"
-"  pe-i386\n"
-"  pei-i386\n"
-    );
-    exit(0);
-}
-
-static void error(const TCHAR *basename, const TCHAR *fmt, ...) {
-    _ftprintf(stderr, _T(TS": error: "), basename);
-    va_list ap;
-    va_start(ap, fmt);
-    _vftprintf(stderr, fmt, ap);
-    _ftprintf(stderr, _T("\n"));
-    va_end(ap);
-    exit(1);
-}
-
-static void print_argv(const TCHAR **exec_argv) {
-    while (*exec_argv) {
-        _ftprintf(stderr, _T(TS" "), *exec_argv);
-        exec_argv++;
-    }
-    _ftprintf(stderr, _T("\n"));
-}
-
-static void check_num_args(int arg, int max_arg) {
-    if (arg > max_arg) {
-        fprintf(stderr, "Too many options added\n");
-        abort();
-    }
-}
-
-int _tmain(int argc, TCHAR* argv[]) {
-    const TCHAR *dir;
-    const TCHAR *basename;
-    const TCHAR *target;
-    split_argv(argv[0], &dir, &basename, &target, NULL);
-    if (!target)
-        target = _T(DEFAULT_TARGET);
-
-    const TCHAR *bfd_target = NULL;
-    const TCHAR *input = _T("-");
-    const TCHAR *output = _T("/dev/stdout");
-    const TCHAR *input_format = _T("rc");
-    const TCHAR *output_format = _T("coff");
-    const TCHAR **includes = malloc(argc * sizeof(*includes));
-    int nb_includes = 0;
-    const TCHAR *codepage = _T("1252");
-    const TCHAR *language = NULL;
-    const TCHAR *preprocessor = NULL;
-    const TCHAR **cpp_options = malloc(argc * sizeof(*cpp_options));
-    int nb_cpp_options = 0;
-    int verbose = 0;
-
-#define _tcslen_const(a) (sizeof(a)/sizeof(TCHAR) - 1)
-#define _tcsstart(a, b) !_tcsncmp(a, b, _tcslen_const(b))
-
-#define IF_MATCH_EITHER(short, long) \
-    if (!_tcscmp(argv[i], _T(short)) || !_tcscmp(argv[i], _T(long)))
-#define IF_MATCH_THREE(first, second, third) \
-    if (!_tcscmp(argv[i], _T(first)) || !_tcscmp(argv[i], _T(second)) || !_tcscmp(argv[i], _T(third)))
-#define OPTION(short, long, var) \
-    if (_tcsstart(argv[i], _T(short)) && argv[i][_tcslen_const(_T(short))]) { \
-        var = argv[i] + _tcslen_const(_T(short)); \
-    } else if (_tcsstart(argv[i], _T(long "="))) { \
-        var = _tcschr(argv[i], '=') + 1; \
-    } else IF_MATCH_EITHER(short, long) { \
-        if (i + 1 < argc) \
-            var = argv[++i]; \
-        else \
-            error(basename, _T(TS" missing argument"), argv[i]); \
-    }
-#define SEPARATE_ARG(var) do { \
-        if (i + 1 < argc) \
-            var = argv[++i]; \
-        else \
-            error(basename, _T(TS" missing argument"), argv[i]); \
-    } while (0)
-#define SEPARATE_ARG_PREFIX(var, prefix) do { \
-        if (i + 1 < argc) \
-            var = concat(_T(prefix), argv[++i]); \
-        else \
-            error(basename, _T(TS" missing argument"), argv[i]); \
-    } while (0)
-
-    for (int i = 1; i < argc; i++) {
-        OPTION("-i", "--input", input)
-        else OPTION("-o", "--output", output)
-        else OPTION("-J", "--input-format", input_format)
-        else OPTION("-O", "--output-format", output_format)
-        else OPTION("-F", "--target", bfd_target)
-        else IF_MATCH_THREE("-I", "--include-dir", "--include") {
-            SEPARATE_ARG(includes[nb_includes++]);
-        } else if (_tcsstart(argv[i], _T("--include-dir=")) ||
-                   _tcsstart(argv[i], _T("--include="))) {
-            includes[nb_includes++] = _tcschr(argv[i], '=') + 1;
-        } else if (_tcsstart(argv[i], _T("-I"))) {
-            includes[nb_includes++] = argv[i] + 2;
-        } else OPTION("-c", "--codepage", codepage)
-        else OPTION("-l", "--language", language)
-        else if (!_tcscmp(argv[i], _T("--preprocessor"))) {
-            SEPARATE_ARG(preprocessor);
-        } else if (_tcsstart(argv[i], _T("--preprocessor-arg="))) {
-            cpp_options[nb_cpp_options++] = _tcschr(argv[i], '=') + 1;
-        } else if (!_tcscmp(argv[i], _T("--preprocessor-arg"))) {
-            SEPARATE_ARG(cpp_options[nb_cpp_options++]);
-        } else IF_MATCH_EITHER("-D", "--define") {
-            SEPARATE_ARG_PREFIX(cpp_options[nb_cpp_options++], "-D");
-        } else if (_tcsstart(argv[i], _T("-D"))) {
-            cpp_options[nb_cpp_options++] = argv[i];
-        } else IF_MATCH_EITHER("-U", "--undefine") {
-            SEPARATE_ARG_PREFIX(cpp_options[nb_cpp_options++], "-U");
-        } else if (_tcsstart(argv[i], _T("-U"))) {
-            cpp_options[nb_cpp_options++] = argv[i];
-        } else IF_MATCH_EITHER("-v", "--verbose") {
-            verbose = 1;
-        } else IF_MATCH_EITHER("-V", "--version") {
-            print_version();
-        } else IF_MATCH_EITHER("-h", "--help") {
-            print_help();
-        } else if (!_tcscmp(argv[i], _T("--use-temp-file"))) {
-            // No-op, we use a temp file by default.
-        } else if (_tcsstart(argv[i], _T("-"))) {
-            error(basename, _T("unrecognized option: `"TS"'"), argv[i]);
-        } else {
-            if (!_tcscmp(input, _T("-")))
-                input = argv[i];
-            else if (!_tcscmp(output, _T("/dev/stdout")))
-                output = argv[i];
-            else
-                error(basename, _T("rip: `"TS"'"), argv[i]);
-        }
-    }
-    if (bfd_target) {
-        if (!_tcscmp(bfd_target, _T("pe-x86-64")) ||
-            !_tcscmp(bfd_target, _T("pei-x86-64")))
-            target = _T("x86_64-w64-mingw32");
-        else if (!_tcscmp(bfd_target, _T("pe-i386")) ||
-                 !_tcscmp(bfd_target, _T("pei-i386")))
-            target = _T("i686-w64-mingw32");
-        else
-            error(basename, _T("unsupported target: `"TS"'"), bfd_target);
-    }
-
-    TCHAR *arch = _tcsdup(target);
-    TCHAR *dash = _tcschr(arch, '-');
-    if (dash)
-        *dash = '\0';
-
-    const TCHAR *machine = _T("unknown");
-    if (!_tcscmp(arch, _T("i686")))
-        machine = _T("X86");
-    else if (!_tcscmp(arch, _T("x86_64")))
-        machine = _T("X64");
-    else if (!_tcscmp(arch, _T("armv7")))
-        machine = _T("ARM");
-    else if (!_tcscmp(arch, _T("aarch64")))
-        machine = _T("ARM64");
-
-    const TCHAR *CC = concat(target, _T("-clang"));
-
-    const TCHAR **rc_options = malloc(2 * argc * sizeof(*cpp_options));
-    int nb_rc_options = 0;
-    for (int i = 0; i < nb_includes; i++) {
-        cpp_options[nb_cpp_options++] = concat(_T("-I"), includes[i]);
-        rc_options[nb_rc_options++] = _T("-I");
-        rc_options[nb_rc_options++] = includes[i];
-    }
-
-    for (int i = 0; i < nb_cpp_options; i++)
-        cpp_options[i] = unescape_cpp(cpp_options[i]);
-
-    const TCHAR *preproc_rc = concat(output, _T(".preproc.rc"));
-    const TCHAR *res = concat(output, _T(".out.res"));
-
-    TCHAR *inputdir = _tcsdup(input);
-    {
-        TCHAR *sep = _tcsrchrs(inputdir, '/', '\\');
-        if (sep)
-            *sep = '\0';
-        else
-            inputdir = _tcsdup(_T("."));
-    }
-
-
-    int max_arg = 2 * argc + 20;
-    if (preprocessor)
-        max_arg += split_args(preprocessor, NULL, NULL, 0);
-    const TCHAR **exec_argv = malloc((max_arg + 1) * sizeof(*exec_argv));
-    int arg = 0;
-
-    if (!_tcsicmp(input_format, _T("rc"))) {
-        if (preprocessor) {
-            split_args(preprocessor, exec_argv, &arg, max_arg);
-        } else {
-            exec_argv[arg++] = concat(dir, CC);
-            exec_argv[arg++] = _T("-E");
-            exec_argv[arg++] = _T("-xc");
-            exec_argv[arg++] = _T("-DRC_INVOKED=1");
-        }
-        for (int i = 0; i < nb_cpp_options; i++)
-            exec_argv[arg++] = cpp_options[i];
-        exec_argv[arg++] = input;
-        exec_argv[arg++] = _T("-o");
-        exec_argv[arg++] = preproc_rc;
-        exec_argv[arg] = NULL;
-
-        check_num_args(arg, max_arg);
-        if (verbose)
-            print_argv(exec_argv);
-        int ret = _tspawnvp_escape(_P_WAIT, exec_argv[0], exec_argv);
-        if (ret == -1) {
-            _tperror(exec_argv[0]);
-            return 1;
-        }
-        if (ret != 0) {
-            error(basename, _T("preprocessor failed"));
-            return ret;
-        }
-
-        arg = 0;
-        exec_argv[arg++] = concat(dir, _T("llvm-rc"));
-        for (int i = 0; i < nb_rc_options; i++)
-            exec_argv[arg++] = rc_options[i];
-        exec_argv[arg++] = _T("-I");
-        exec_argv[arg++] = inputdir;
-        exec_argv[arg++] = preproc_rc;
-        exec_argv[arg++] = _T("-c");
-        exec_argv[arg++] = codepage;
-        if (language) {
-            exec_argv[arg++] = _T("-l");
-            exec_argv[arg++] = language;
-        }
-        exec_argv[arg++] = _T("-fo");
-        if (!_tcsicmp(output_format, _T("res")))
-            exec_argv[arg++] = output;
-        else
-            exec_argv[arg++] = res;
-        exec_argv[arg] = NULL;
-
-        check_num_args(arg, max_arg);
-        if (verbose)
-            print_argv(exec_argv);
-        ret = _tspawnvp_escape(_P_WAIT, exec_argv[0], exec_argv);
-        if (ret == -1) {
-            _tperror(exec_argv[0]);
-            return 1;
-        }
-        if (!verbose)
-            _tunlink(preproc_rc);
-        if (ret != 0) {
-            error(basename, _T("llvm-rc failed"));
-            return ret;
-        }
-
-        if (!_tcsicmp(output_format, _T("res"))) {
-            // All done
-        } else if (!_tcsicmp(output_format, _T("coff"))) {
-            arg = 0;
-            exec_argv[arg++] = concat(dir, _T("llvm-cvtres"));
-            exec_argv[arg++] = res;
-            exec_argv[arg++] = concat(_T("-machine:"), machine);
-            exec_argv[arg++] = concat(_T("-out:"), output);
-            exec_argv[arg] = NULL;
-
-            check_num_args(arg, max_arg);
-            if (verbose)
-                print_argv(exec_argv);
-            int ret = _tspawnvp_escape(_P_WAIT, exec_argv[0], exec_argv);
-            if (ret == -1) {
-                _tperror(exec_argv[0]);
-                return 1;
-            }
-            if (!verbose)
-                _tunlink(res);
-            return ret;
-        } else {
-            error(basename, _T("invalid output format: `"TS"'"), output_format);
-        }
-    } else if (!_tcsicmp(input_format, _T("res"))) {
-        exec_argv[arg++] = concat(dir, _T("llvm-cvtres"));
-        exec_argv[arg++] = input;
-        exec_argv[arg++] = concat(_T("-machine:"), machine);
-        exec_argv[arg++] = concat(_T("-out:"), output);
-        exec_argv[arg] = NULL;
-
-        check_num_args(arg, max_arg);
-        if (verbose)
-            print_argv(exec_argv);
-        int ret = _tspawnvp_escape(_P_WAIT, exec_argv[0], exec_argv);
-        if (ret == -1) {
-            _tperror(exec_argv[0]);
-            return 1;
-        }
-        return ret;
-    } else {
-        error(basename, _T("invalid input format: `"TS"'"), input_format);
-    }
-
-    return 0;
-}