diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 7648d80..267cf4f 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -14,6 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: recursive
     - name: Install xsltproc
       run: sudo apt-get install xsltproc
     - name: Build
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0f8416f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "support/XKCBuild"]
+	path = support/XKCBuild
+	url = https://github.com/XKCP/XKCBuild.git
diff --git a/Makefile b/Makefile
index dbf11de..bf58eb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,2 @@
-_list: Makefile.build support/Build/ToGlobalMakefile.xsl
-
-bin/.build/Makefile: bin/.build/Makefile.expanded
-	mkdir -p $(dir $@)
-	xsltproc --xinclude -o $@ support/Build/ToGlobalMakefile.xsl $<
-
-bin/.build/Makefile.expanded: Makefile.build
-	mkdir -p $(dir $@)
-	xsltproc --xinclude -o $@ support/Build/ExpandProducts.xsl $<
-
--include bin/.build/Makefile
-
-.PHONY: clean
-clean:
-	rm -rf bin/
+XKCBpath = support/XKCBuild
+include $(XKCBpath)/src/Main.makefile
diff --git a/support/Build/ExpandProducts.xsl b/support/Build/ExpandProducts.xsl
deleted file mode 100644
index fb19f5c..0000000
--- a/support/Build/ExpandProducts.xsl
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!--
-The eXtended Keccak Code Package (XKCP)
-https://github.com/XKCP/XKCP
-
-Implementation by Gilles Van Assche, hereby denoted as "the implementer".
-
-For more information, feedback or questions, please refer to the Keccak Team website:
-https://keccak.team/
-
-To the extent possible under law, the implementer has waived all copyright
-and related or neighboring rights to the source code in this file.
-http://creativecommons.org/publicdomain/zero/1.0/
--->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version='1.0'>
-
-<xsl:template name="expand">
-    <xsl:param name="first"/>
-    <xsl:param name="second"/>
-    <xsl:param name="first-explored" select="''"/>
-    <xsl:param name="second-explored" select="''"/>
-    <xsl:param name="delimiter"/>
-    <xsl:variable name="first-cur" select="substring-before(concat($first, ' '), ' ')"/>
-    <xsl:variable name="first-rest" select="substring-after($first, ' ')"/>
-    <xsl:variable name="second-cur" select="substring-before(concat($second, ' '), ' ')"/>
-    <xsl:variable name="second-rest" select="substring-after($second, ' ')"/>
-
-    <xsl:if test="($first-cur!='') and ($second-cur!='')">
-        <target>
-            <xsl:attribute name="name"><xsl:value-of select="concat($first-cur, $delimiter, $second-cur)"/></xsl:attribute>
-            <xsl:attribute name="inherits"><xsl:value-of select="concat($first-cur, ' ', $second-cur)"/></xsl:attribute>
-        </target>
-
-        <xsl:choose>
-            <xsl:when test="normalize-space($second-rest)!=''">
-                <xsl:call-template name="expand">
-                    <xsl:with-param name="first" select="$first"/>
-                    <xsl:with-param name="first-explored" select="$first-explored"/>
-                    <xsl:with-param name="second" select="$second-rest"/>
-                    <xsl:with-param name="second-explored" select="normalize-space(concat($second-explored, ' ', $second-cur))"/>
-                    <xsl:with-param name="delimiter" select="$delimiter"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="normalize-space($first-rest)!=''">
-                <xsl:call-template name="expand">
-                    <xsl:with-param name="first" select="$first-rest"/>
-                    <xsl:with-param name="first-explored" select="normalize-space(concat($first-explored, ' ', $first-cur))"/>
-                    <xsl:with-param name="second" select="normalize-space(concat($second-explored, ' ', $second-cur))"/>
-                    <xsl:with-param name="second-explored" select="''"/>
-                    <xsl:with-param name="delimiter" select="$delimiter"/>
-                </xsl:call-template>
-            </xsl:when>
-        </xsl:choose>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="product">
-    <xsl:call-template name="expand">
-        <xsl:with-param name="first" select="normalize-space(factor[1]/@set)"/>
-        <xsl:with-param name="second" select="normalize-space(factor[2]/@set)"/>
-        <xsl:with-param name="delimiter">
-            <xsl:choose>
-                <xsl:when test="@delimiter!=''"><xsl:value-of select="@delimiter"/></xsl:when>
-                <xsl:otherwise>+</xsl:otherwise>
-            </xsl:choose>
-        </xsl:with-param>
-    </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="*">
-    <xsl:copy>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates/>
-    </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/support/Build/ToGlobalMakefile.xsl b/support/Build/ToGlobalMakefile.xsl
deleted file mode 100644
index ac665e8..0000000
--- a/support/Build/ToGlobalMakefile.xsl
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!--
-The eXtended Keccak Code Package (XKCP)
-https://github.com/XKCP/XKCP
-
-Implementation by Gilles Van Assche, hereby denoted as "the implementer".
-
-For more information, feedback or questions, please refer to the Keccak Team website:
-https://keccak.team/
-
-To the extent possible under law, the implementer has waived all copyright
-and related or neighboring rights to the source code in this file.
-http://creativecommons.org/publicdomain/zero/1.0/
--->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version='1.0'>
-
-<xsl:output method="text" indent="no" encoding="UTF-8"/>
-
-<xsl:template match="target">
-    <xsl:variable name="targetfile" select="concat('bin/.build/', @name, '.target')"/>
-    <xsl:variable name="makefile" select="concat('bin/.build/', @name, '.make')"/>
-    <xsl:variable name="configfile" select="concat('bin/.build/', @name, '/config.h')"/>
-    <xsl:variable name="object" select="concat('bin/', @name)"/>
-    <xsl:variable name="pack" select="concat(@name, '.pack')"/>
-    <xsl:variable name="vcxprojname" select="concat(@name, '.vcxproj')"/>
-    <xsl:variable name="vcxprojdir" select="concat('bin/VC/', @name, '/')"/>
-    <xsl:variable name="vcxprojfile" select="concat('bin/VC/', translate(@name, '/', '_'), '.vcxproj')"/>
-    <xsl:variable name="all" select="../@all"/>
-
-    <xsl:if test="$all!=''">
-        <xsl:value-of select="$all"/>
-        <xsl:text>: </xsl:text>
-        <xsl:value-of select="@name"/>
-        <xsl:text>
-</xsl:text>
-        <xsl:value-of select="$all"/>
-        <xsl:text>.packs: </xsl:text>
-        <xsl:value-of select="$pack"/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-
-    <xsl:text>.PHONY: </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$object"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$pack"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$vcxprojname"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:value-of select="@name"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$configfile"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$object"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:value-of select="$object"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$makefile"/>
-    <xsl:text>
-&#9;$(MAKE) -f </xsl:text>
-    <xsl:value-of select="$makefile"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:value-of select="$pack"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$makefile"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$configfile"/>
-    <xsl:text>
-&#9;$(MAKE) -f </xsl:text>
-    <xsl:value-of select="$makefile"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$pack"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:value-of select="$vcxprojname"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$vcxprojfile"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:value-of select="$vcxprojfile"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$targetfile"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$configfile"/>
-    <xsl:text>
-&#9;mkdir -p </xsl:text>
-	<xsl:value-of select="$vcxprojdir"/>/config<xsl:text>
-&#9;cp </xsl:text>
-	<xsl:value-of select="$configfile"/>
-	<xsl:text> </xsl:text>
-	<xsl:value-of select="$vcxprojdir"/><xsl:text>/config
-&#9;xsltproc -o $@ support/Build/ToVCXProj.xsl </xsl:text>
-    <xsl:value-of select="$targetfile"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:value-of select="$makefile"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$targetfile"/>
-    <xsl:text> support/Build/ToTargetMakefile.xsl
-&#9;mkdir -p $(dir $@)
-&#9;xsltproc -o $@ support/Build/ToTargetMakefile.xsl $&lt;
-</xsl:text>
-
-    <xsl:value-of select="$configfile"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$targetfile"/>
-    <xsl:text> support/Build/ToTargetConfigFile.xsl
-&#9;mkdir -p $(dir $@)
-&#9;xsltproc -o $@ support/Build/ToTargetConfigFile.xsl $&lt;
-</xsl:text>
-
-    <xsl:value-of select="$targetfile"/>
-    <xsl:text>: support/Build/ToOneTarget.xsl bin/.build/Makefile.expanded Makefile.build
-&#9;mkdir -p $(dir $@)
-&#9;xsltproc -o $@ -param nameTarget "'</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>'" support/Build/ToOneTarget.xsl bin/.build/Makefile.expanded
-
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="group">
-    <xsl:if test="@all!=''">
-        <xsl:text>.PHONY: </xsl:text>
-        <xsl:value-of select="@all"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@all"/><xsl:text>.packs</xsl:text>
-        <xsl:text>
-</xsl:text>
-        <xsl:if test="../@all!=''">
-            <xsl:value-of select="../@all"/>
-            <xsl:text>: </xsl:text>
-            <xsl:value-of select="@all"/>
-            <xsl:text>
-</xsl:text>
-            <xsl:value-of select="../@all"/><xsl:text>.packs</xsl:text>
-            <xsl:text>: </xsl:text>
-            <xsl:value-of select="@all"/><xsl:text>.packs</xsl:text>
-            <xsl:text>
-</xsl:text>
-        </xsl:if>
-    </xsl:if>
-
-    <xsl:apply-templates select="target|group"/>
-</xsl:template>
-
-<xsl:template match="group" mode="list">
-    <xsl:if test="@all!=''">
-        <xsl:text>&#9;@echo "+ </xsl:text>
-        <xsl:value-of select="@all"/>
-        <xsl:text>[.packs]"
-</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="target|group" mode="list"/>
-</xsl:template>
-
-<xsl:template match="target" mode="list">
-    <xsl:text>&#9;@echo "- </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>[.pack|.vcxproj]"
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="build">
-<xsl:text>.PHONY: _list
-_list:
-&#9;@echo "The defined targets (-) and groups of targets (+) are:"
-</xsl:text>
-    <xsl:if test="@all!=''">
-        <xsl:text>&#9;@echo "+ </xsl:text>
-        <xsl:value-of select="@all"/>
-        <xsl:text>[.packs]"
-</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="target|group" mode="list"/>
-        <xsl:text>
-</xsl:text>
-
-    <xsl:if test="@all!=''">
-        <xsl:text>.PHONY: </xsl:text>
-        <xsl:value-of select="@all"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@all"/><xsl:text>.packs</xsl:text>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-
-    <xsl:apply-templates select="target|group"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/support/Build/ToOneTarget.xsl b/support/Build/ToOneTarget.xsl
deleted file mode 100644
index c4669a1..0000000
--- a/support/Build/ToOneTarget.xsl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!--
-The eXtended Keccak Code Package (XKCP)
-https://github.com/XKCP/XKCP
-
-Implementation by Gilles Van Assche, hereby denoted as "the implementer".
-
-For more information, feedback or questions, please refer to the Keccak Team website:
-https://keccak.team/
-
-To the extent possible under law, the implementer has waived all copyright
-and related or neighboring rights to the source code in this file.
-http://creativecommons.org/publicdomain/zero/1.0/
--->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version='1.0'>
-
-<xsl:param name="nameTarget"/>
-
-<xsl:template name="buildList">
-    <xsl:param name="queued"/>
-    <xsl:param name="explored" select="'|'"/>
-    <xsl:variable name="first" select="substring-before(concat($queued, ' '), ' ')"/>
-    <xsl:variable name="inheritedFromFirst" select="//*[@name=$first]/@inherits"/>
-    <xsl:variable name="restOfQueue" select="substring-after($queued, ' ')"/>
-    <xsl:choose>
-        <xsl:when test="$first=''">
-            <xsl:value-of select="$explored"/>
-        </xsl:when>
-        <xsl:when test="contains($explored, concat('|', $first, '|'))">
-            <xsl:call-template name="buildList">
-                <xsl:with-param name="queued" select="normalize-space($restOfQueue)"/>
-                <xsl:with-param name="explored" select="$explored"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="buildList">
-                <xsl:with-param name="queued" select="normalize-space(concat($restOfQueue, ' ', $inheritedFromFirst))"/>
-                <xsl:with-param name="explored" select="concat($explored, $first, '|')"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-
-</xsl:template>
-
-<xsl:template match="build">
-    <xsl:variable name="listFragments">
-        <xsl:call-template name="buildList">
-            <xsl:with-param name="queued" select="$nameTarget"/>
-        </xsl:call-template>
-    </xsl:variable>
-    <target name="{$nameTarget}">
-        <xsl:apply-templates select="//*[contains($listFragments, concat('|',@name,'|'))]"/>
-    </target>
-</xsl:template>
-
-<xsl:template match="target|fragment">
-    <xsl:apply-templates select="*|text()"/>
-</xsl:template>
-
-<xsl:template name="getFilePrefix">
-    <xsl:param name="fullPath"/>
-    <xsl:param name="prefix"/>
-    <xsl:choose>
-        <xsl:when test="contains($fullPath, '/')">
-            <xsl:call-template name="getFilePrefix">
-                <xsl:with-param name="fullPath" select="substring-after($fullPath, '/')"/>
-                <xsl:with-param name="prefix" select="concat($prefix, substring-before($fullPath, '/'), '/')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$prefix"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template match="h|inc">
-    <xsl:copy-of select="."/>
-    <I><xsl:call-template name="getFilePrefix">
-        <xsl:with-param name="fullPath" select="."/>
-    </xsl:call-template></I>
-</xsl:template>
-
-<xsl:template match="*">
-    <xsl:copy-of select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/support/Build/ToTargetConfigFile.xsl b/support/Build/ToTargetConfigFile.xsl
deleted file mode 100644
index 47b6210..0000000
--- a/support/Build/ToTargetConfigFile.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!--
-The eXtended Keccak Code Package (XKCP)
-https://github.com/XKCP/XKCP
-
-Implementation by Gilles Van Assche, hereby denoted as "the implementer".
-
-For more information, feedback or questions, please refer to the Keccak Team website:
-https://keccak.team/
-
-To the extent possible under law, the implementer has waived all copyright
-and related or neighboring rights to the source code in this file.
-http://creativecommons.org/publicdomain/zero/1.0/
--->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version='1.0'>
-
-<xsl:output method="text" indent="no" encoding="UTF-8"/>
-
-<xsl:template match="text()"/>
-
-<xsl:template match="config">
-    <xsl:text>#define </xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="target">
-    <xsl:text>/* File generated by ToTargetConfigFile.xsl */
-
-</xsl:text>
-    <xsl:apply-templates match="config"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/support/Build/ToTargetMakefile.xsl b/support/Build/ToTargetMakefile.xsl
deleted file mode 100644
index 8947b91..0000000
--- a/support/Build/ToTargetMakefile.xsl
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!--
-The eXtended Keccak Code Package (XKCP)
-https://github.com/XKCP/XKCP
-
-Implementation by Gilles Van Assche, hereby denoted as "the implementer".
-
-For more information, feedback or questions, please refer to the Keccak Team website:
-https://keccak.team/
-
-To the extent possible under law, the implementer has waived all copyright
-and related or neighboring rights to the source code in this file.
-http://creativecommons.org/publicdomain/zero/1.0/
--->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version='1.0'>
-
-<xsl:key name="I" match="I" use="."/>
-<xsl:key name="h" match="h" use="."/>
-<xsl:key name="c" match="c|s" use="."/>
-<xsl:key name="inc" match="inc" use="."/>
-
-<xsl:output method="text" indent="no" encoding="UTF-8"/>
-
-<xsl:template name="filename">
-    <xsl:param name="fullPath"/>
-    <xsl:choose>
-        <xsl:when test="contains($fullPath, '/')">
-            <xsl:call-template name="filename">
-                <xsl:with-param name="fullPath" select="substring-after($fullPath, '/')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$fullPath"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="getFileNameWithoutExtension">
-    <xsl:param name="fullPath"/>
-    <xsl:choose>
-        <xsl:when test="contains($fullPath, '/')">
-            <xsl:call-template name="getFileNameWithoutExtension">
-                <xsl:with-param name="fullPath" select="substring-after($fullPath, '/')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="substring-before($fullPath, '.')"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template match="gcc">
-    <!-- What follows is a shameless hack to avoid -march/-mtune=native on arm64/aarch64 with clang -->
-    <xsl:if test=".= '-march=native' or .= '-mtune=native'">
-        <xsl:text>ifneq ($(UNAME_M),aarch64)
-ifneq ($(UNAME_S),Darwin)
-</xsl:text>
-    </xsl:if>
-    <xsl:text>CFLAGS := $(CFLAGS) </xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:text>
-</xsl:text>
-    <xsl:if test=".= '-march=native' or .= '-mtune=native'">
-        <xsl:text>endif
-endif
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="gas">
-    <!-- What follows is a shameless hack to avoid -march/-mtune=native on arm64/aarch64 with clang -->
-    <xsl:if test=".= '-march=native' or .= '-mtune=native'">
-        <xsl:text>ifneq ($(UNAME_M),aarch64)
-ifneq ($(UNAME_S),Darwin)
-</xsl:text>
-    </xsl:if>
-    <xsl:text>ASMFLAGS := $(ASMFLAGS) </xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:text>
-</xsl:text>
-    <xsl:if test=".= '-march=native' or .= '-mtune=native'">
-        <xsl:text>endif
-endif
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="define">
-    <xsl:text>CFLAGS := $(CFLAGS) -D</xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:if test="@as">="<xsl:value-of select="@as"/>"</xsl:if>
-    <xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="I">
-    <xsl:if test="generate-id()=generate-id(key('I', .)[1])">
-        <xsl:text>INCLUDEFLAGS := $(INCLUDEFLAGS) -I</xsl:text>
-        <xsl:value-of select="."/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="h">
-    <xsl:if test="generate-id()=generate-id(key('h', .)[1])">
-        <xsl:text>HEADERS := $(HEADERS) </xsl:text>
-        <xsl:value-of select="."/>
-        <xsl:text>
-</xsl:text>
-        <xsl:text>SOURCES := $(SOURCES) </xsl:text>
-        <xsl:value-of select="."/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="inc">
-    <xsl:if test="generate-id()=generate-id(key('inc', .)[1])">
-        <xsl:text>INCLUDES := $(INCLUDES) </xsl:text>
-        <xsl:value-of select="."/>
-        <xsl:text>
-</xsl:text>
-        <xsl:text>SOURCES := $(SOURCES) </xsl:text>
-        <xsl:value-of select="."/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="c|s">
-    <xsl:if test="generate-id()=generate-id(key('c', .)[1])">
-        <xsl:text>
-SOURCES := $(SOURCES) </xsl:text>
-        <xsl:value-of select="."/>
-        <xsl:text>
-</xsl:text>
-        <xsl:variable name="object">
-            <xsl:text>$(BINDIR)/</xsl:text>
-            <xsl:call-template name="getFileNameWithoutExtension">
-                <xsl:with-param name="fullPath" select="."/>
-            </xsl:call-template>
-            <xsl:text>.o</xsl:text>
-        </xsl:variable>
-        <xsl:value-of select="$object"/>
-        <xsl:text>: </xsl:text>
-        <xsl:value-of select="."/>
-        <xsl:text> $(HEADERS) $(INCLUDES)
-</xsl:text>
-        <xsl:choose>
-            <xsl:when test="local-name(.) = 's'">
-                <xsl:text>&#9;$(CC) $(INCLUDEFLAGS) $(ASMFLAGS) </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>&#9;$(CC) $(INCLUDEFLAGS) $(CFLAGS) </xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:value-of select="@gcc"/>
-        <xsl:text> -c $&lt; -o $@
-OBJECTS := $(OBJECTS) </xsl:text>
-        <xsl:value-of select="$object"/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()"/>
-
-<xsl:template match="target">
-    <xsl:variable name="final" select="concat('bin/', @name)"/>
-    <xsl:variable name="pack" select="concat('bin/', translate(@name, '/', '_'), '.tar.gz')"/>
-    <xsl:variable name="configfilepath" select="concat('bin/.build/', @name, '/')"/>
-    <xsl:variable name="configfile" select="concat($configfilepath, 'config.h')"/>
-
-    <xsl:text>all: </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>
-</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$final"/>
-    <xsl:text>
-</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>.pack: </xsl:text>
-    <xsl:value-of select="$pack"/>
-    <xsl:text>
-
-</xsl:text>
-    <xsl:text>BINDIR = bin/.build/</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>
-$(BINDIR):
-&#9;mkdir -p $(BINDIR)
-
-MAKE ?= gmake
-CC ?= gcc
-AR = ar
-
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Linux)
-    ASMFLAGS :=
-endif
-ifeq ($(UNAME_S),Darwin)
-    ASMFLAGS := -x assembler-with-cpp -Wa,-defsym,old_gas_syntax=1 -Wa,-defsym,no_plt=1
-endif
-ifneq (,$(findstring mingw32,$(CC)))
-    ASMFLAGS := -x assembler-with-cpp -Wa,-defsym,old_gas_syntax=1 -Wa,-defsym,no_plt=1
-endif
-UNAME_M := $(shell uname -m)
-
-</xsl:text>
-
-    <xsl:if test="substring(@name, string-length(@name)-2, 3)='.so'">
-        <xsl:text>CFLAGS := $(CFLAGS) -fpic
-</xsl:text>
-    </xsl:if>
-
-    <xsl:text>HEADERS := $(HEADERS) </xsl:text>
-    <xsl:value-of select="$configfile"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:text>SOURCES := $(SOURCES) </xsl:text>
-    <xsl:value-of select="$configfile"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:text>INCLUDEFLAGS := $(INCLUDEFLAGS) -I</xsl:text>
-    <xsl:value-of select="$configfilepath"/>
-    <xsl:text>
-</xsl:text>
-
-    <xsl:apply-templates select="gcc|gas|define|I"/>
-    <xsl:apply-templates select="h"/>
-    <xsl:apply-templates select="inc"/>
-    <xsl:apply-templates select="c|s"/>
-
-    <xsl:text>
-bin/</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>: $(BINDIR) $(OBJECTS)
-&#9;mkdir -p $(dir $@)
-</xsl:text>
-
-    <xsl:choose>
-        <xsl:when test="substring(@name, string-length(@name)-1, 2)='.a'">
-            <xsl:text>&#9;mkdir -p $@.headers
-&#9;cp -f $(HEADERS) $@.headers/
-&#9;$(AR) rcsv $@ $(OBJECTS)
-</xsl:text>
-        </xsl:when>
-        <xsl:when test="substring(@name, string-length(@name)-2, 3)='.so'">
-            <xsl:text>&#9;mkdir -p $@.headers
-&#9;cp -f $(HEADERS) $@.headers/
-&#9;$(CC) -shared -o $@ $(OBJECTS) $(CFLAGS)
-</xsl:text>
-        </xsl:when>
-        <xsl:when test="substring(@name, string-length(@name)-5, 6)='.dylib'">
-            <xsl:text>&#9;mkdir -p $@.headers
-&#9;cp -f $(HEADERS) $@.headers/
-&#9;$(CC) -dynamiclib -install_name @rpath/</xsl:text>
-        <xsl:value-of select="@name"/>
-        <xsl:text> $(OBJECTS) -o $@
-</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:text>&#9;$(CC) -o $@ $(OBJECTS) $(CFLAGS)
-</xsl:text>
-        </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:text>
-</xsl:text>
-
-    <xsl:value-of select="$pack"/>
-    <xsl:text>: $(SOURCES)
-&#9;mkdir -p bin/.pack/</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>
-&#9;rm -rf bin/.pack/</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>/*
-&#9;cp $(SOURCES) bin/.pack/</xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>/
-&#9;cd bin/.pack/ ; tar -czf </xsl:text>
-    <xsl:value-of select="concat('../../', $pack)"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>/*
-
-</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/support/Build/ToVCXProj.xsl b/support/Build/ToVCXProj.xsl
deleted file mode 100644
index ca4f4dd..0000000
--- a/support/Build/ToVCXProj.xsl
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!--
-The eXtended Keccak Code Package (XKCP)
-https://github.com/XKCP/XKCP
-
-Implementation by Gilles Van Assche, hereby denoted as "the implementer".
-
-For more information, feedback or questions, please refer to the Keccak Team website:
-https://keccak.team/
-
-To the extent possible under law, the implementer has waived all copyright
-and related or neighboring rights to the source code in this file.
-http://creativecommons.org/publicdomain/zero/1.0/
--->
-<xsl:stylesheet
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version='1.0'>
-
-<xsl:key name="I" match="I" use="."/>
-<xsl:key name="h" match="h" use="."/>
-<xsl:key name="c" match="c|s" use="."/>
-<xsl:key name="inc" match="inc" use="."/>
-
-<xsl:template name="ConfigurationType">
-    <xsl:param name="name"/>
-    <xsl:choose>
-        <xsl:when test="substring($name, string-length($name)-1, 2)='.a'">
-            <ConfigurationType>StaticLibrary</ConfigurationType>
-        </xsl:when>
-        <xsl:when test="substring($name, string-length($name)-2, 3)='.so'">
-            <ConfigurationType>DynamicLibrary</ConfigurationType>
-        </xsl:when>
-        <xsl:otherwise>
-            <ConfigurationType>Application</ConfigurationType>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template match="target">
-	<xsl:variable name="name" select="translate(@name, '/', '\')"/>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6F1C9407-7A01-444D-A07B-7DAE147F22A1}</ProjectGuid>
-    <RootNamespace>XKCP</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(RuntimeLibrary)'==''">
-    <RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDll</RuntimeLibrary>
-    <RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDll</RuntimeLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <xsl:call-template name="ConfigurationType"><xsl:with-param name="name" select="$name"/></xsl:call-template>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <xsl:call-template name="ConfigurationType"><xsl:with-param name="name" select="$name"/></xsl:call-template>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutDir>$(ProjectDir)\<xsl:value-of select="$name"/>\$(Configuration)_$(Platform)\</OutDir>
-    <IntDir>$(ProjectDir)\<xsl:value-of select="$name"/>\$(Configuration)_$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(ProjectDir)\<xsl:value-of select="$name"/>\$(Configuration)_$(Platform)\</OutDir>
-    <IntDir>$(ProjectDir)\<xsl:value-of select="$name"/>\$(Configuration)_$(Platform)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>$(RuntimeLibrary)</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)\<xsl:value-of select="$name"/>\config;<xsl:apply-templates select="I"/></AdditionalIncludeDirectories>
-	  <PreprocessorDefinitions><xsl:apply-templates select="define"/>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-	  <xsl:apply-templates select="msvc"/>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>$(RuntimeLibrary)</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\<xsl:value-of select="$name"/>\config;<xsl:apply-templates select="I"/></AdditionalIncludeDirectories>
-	  <PreprocessorDefinitions><xsl:apply-templates select="define"/>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-	  <xsl:apply-templates select="msvc"/>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <xsl:apply-templates select="h|inc"/>
-  </ItemGroup>
-  <ItemGroup>
-    <xsl:apply-templates select="c|s"/>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-</xsl:template>
-
-<xsl:template match="I">
-    <xsl:if test="generate-id()=generate-id(key('I', .)[1])">
-        <xsl:text>$(ProjectDir)..\..\</xsl:text>
-        <xsl:value-of select="translate(., '/', '\')"/>
-        <xsl:text>;</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="h">
-    <xsl:if test="generate-id()=generate-id(key('h', .)[1])">
-        <ClInclude Include="{concat('..\..\', translate(., '/', '\'))}"/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="inc">
-    <xsl:if test="generate-id()=generate-id(key('inc', .)[1])">
-        <ClInclude Include="{concat('..\..\', translate(., '/', '\'))}"/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="c">
-    <xsl:if test="generate-id()=generate-id(key('c', .)[1])">
-        <ClCompile Include="{concat('..\..\', translate(., '/', '\'))}"/>
-        <xsl:text>
-</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="s">
-    <xsl:message terminate="yes">The file '<xsl:value-of select="."/>' is a GCC assembly file and cannot be included in a Microsoft Visual Studio project.</xsl:message>
-</xsl:template>
-
-<xsl:template match="msvc">
-	<AdditionalOptions><xsl:value-of select="."/></AdditionalOptions>
-</xsl:template>
-
-<xsl:template match="define">
-	<xsl:value-of select="."/>
-	<xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="*|text()"/>
-
-</xsl:stylesheet>
diff --git a/support/XKCBuild b/support/XKCBuild
new file mode 160000
index 0000000..e395528
--- /dev/null
+++ b/support/XKCBuild
@@ -0,0 +1 @@
+Subproject commit e39552804c2cf65ef21d3a6b8e6e17281581a615