diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
index b217bfdb547..2fe6ff51854 100644
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -1,12 +1,11 @@
 mingw32_CC=x86_64-w64-mingw32-gcc-posix
 mingw32_CXX=x86_64-w64-mingw32-g++-posix
 mingw32_CFLAGS=-pipe -std=c11
-mingw32_CXXFLAGS=$(mingw32_CFLAGS) -std=c++11
+mingw32_CXXFLAGS=-pipe -std=c++11
 
-mingw32_release_CFLAGS=-O1
-mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)
-
-mingw32_debug_CFLAGS=-O1
-mingw32_debug_CXXFLAGS=$(mingw32_debug_CFLAGS)
+mingw32_release_CFLAGS=-O3
+mingw32_release_CXXFLAGS=$(mingw32_CXXFLAGS) $(mingw32_release_CFLAGS)
 
+mingw32_debug_CFLAGS=-g -O0
 mingw32_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
+mingw32_debug_CXXFLAGS=$(mingw32_CXXFLAGS) $(mingw32_debug_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 06fb2f6efd0..7f2ff22119e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = secp256k1 univalue cryptoconditions
+DIST_SUBDIRS = secp256k1 univalue
 SUBDIRS = cryptoconditions
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(SAN_LDFLAGS) $(HARDENED_LDFLAGS)
 AM_CXXFLAGS = $(SAN_CXXFLAGS) $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS)
diff --git a/src/cryptoconditions/Makefile.am b/src/cryptoconditions/Makefile.am
index f347a1a2933..eab77eeff0f 100644
--- a/src/cryptoconditions/Makefile.am
+++ b/src/cryptoconditions/Makefile.am
@@ -1,24 +1,15 @@
-lib_LTLIBRARIES=libcryptoconditions.la
-noinst_LTLIBRARIES=$(CRYPTOCONDITIONS_CORE)
+noinst_LIBRARIES=libcryptoconditions_core.a
 SUBDIRS = src/include/secp256k1
 
 include_HEADERS = include/cryptoconditions.h
 
 # Have a separate build target for cryptoconditions that does not contain secp256k1
 
-libcryptoconditions_la_SOURCES = include/cryptoconditions.h
-libcryptoconditions_la_LIBADD = $(CRYPTOCONDITIONS_CORE) $(LIBSECP256K1)
-
-AM_CFLAGS = -I$(top_srcdir)/src/asn -I$(top_srcdir)/include -I$(top_srcdir)/src/include \
-			-Wall -Wno-pointer-sign -Wno-discarded-qualifiers
-
 LIBSECP256K1=src/include/secp256k1/libsecp256k1.la
 
 $(LIBSECP256K1): $(wildcard src/secp256k1/*)
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -march:x86-64 -g
 
-CRYPTOCONDITIONS_CORE=libcryptoconditions_core.a
-
 libcryptoconditions_core_a_SOURCES = \
 	src/cryptoconditions.c \
 	src/utils.c \
@@ -74,6 +65,7 @@ libcryptoconditions_core_a_SOURCES = \
 	src/asn/per_decoder.c \
 	src/asn/per_encoder.c \
 	src/asn/per_opentype.c
+libcryptoconditions_core_a_CPPFLAGS=-I. -I./src/include -I./src/asn
 
 test:
 	bash -c '[ -d .env ] || virtualenv .env -p python3'
diff --git a/zcutil/build-win-dtest.sh b/zcutil/build-win-dtest.sh
index 00a64de5bf7..94bed448bde 100755
--- a/zcutil/build-win-dtest.sh
+++ b/zcutil/build-win-dtest.sh
@@ -2,23 +2,24 @@
 export HOST=x86_64-w64-mingw32
 CXX=x86_64-w64-mingw32-g++-posix
 CC=x86_64-w64-mingw32-gcc-posix
-PREFIX="$(pwd)/depends/$HOST"
 
 set -eu -o pipefail
-
 set -x
-cd "$(dirname "$(readlink -f "$0")")/.."
 
-cd depends/ && make HOST=$HOST V=1 NO_QT=1
-cd ../
-WD=$PWD
-cd src/cc
-echo $PWD
-./makecustom
-cd $WD
+UTIL_DIR="$(dirname "$(readlink -f "$0")")"
+BASE_DIR="$(dirname "$(readlink -f "$UTIL_DIR")")"
+PREFIX="$BASE_DIR/depends/$HOST"
+
+cd $BASE_DIR/depends
+make HOST=$HOST NO_QT=1 "$@"
+cd $BASE_DIR
 
 ./autogen.sh
 CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -DCURVE_ALT_BN128 -fopenmp -pthread" CPPFLAGS=-DTESTMODE ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
 sed -i 's/-lboost_system-mt /-lboost_system-mt-s /' configure
-cd src/
-CC="${CC} -g " CXX="${CXX} -g " make V=1  komodod.exe komodo-cli.exe komodo-tx.exe
+
+cd $BASE_DIR/src/cryptoconditions
+CC="${CC} -g " CXX="${CXX} -g " make V=1
+cd $BASE_DIR
+
+CC="${CC} -g " CXX="${CXX} -g " make V=1  src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe
diff --git a/zcutil/build-win.sh b/zcutil/build-win.sh
index e8c0465d98b..ffd01134074 100755
--- a/zcutil/build-win.sh
+++ b/zcutil/build-win.sh
@@ -2,23 +2,19 @@
 export HOST=x86_64-w64-mingw32
 CXX=x86_64-w64-mingw32-g++-posix
 CC=x86_64-w64-mingw32-gcc-posix
-PREFIX="$(pwd)/depends/$HOST"
 
 set -eu -o pipefail
 
-set -x
-cd "$(dirname "$(readlink -f "$0")")/.."
+UTIL_DIR="$(dirname "$(readlink -f "$0")")"
+BASE_DIR="$(dirname "$(readlink -f "$UTIL_DIR")")"
+PREFIX="$BASE_DIR/depends/$HOST"
 
-cd depends/ && make HOST=$HOST V=1 NO_QT=1
-cd ../
-WD=$PWD
-cd src/cc
-echo $PWD
-./makecustom
-cd $WD
+cd $BASE_DIR/depends
+make HOST=$HOST NO_QT=1 "$@"
+cd $BASE_DIR
 
 ./autogen.sh
-CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -DCURVE_ALT_BN128 -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
+CONFIG_SITE=$BASE_DIR/depends/$HOST/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -DCURVE_ALT_BN128 -fopenmp -pthread" ./configure --prefix=$PREFIX --host=$HOST --enable-static --disable-shared
 sed -i 's/-lboost_system-mt /-lboost_system-mt-s /' configure
-cd src/
-CC="${CC} -g " CXX="${CXX} -g " make V=1  komodod.exe komodo-cli.exe komodo-tx.exe
+
+make "$@"