diff --git a/Makefile.host b/Makefile.host
index 6d405ee14..896c9b361 100644
--- a/Makefile.host
+++ b/Makefile.host
@@ -28,7 +28,7 @@ POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d && $(TOUCH) $@
 BINDIR := .
 OBJDIR := obj
 
-MYOBJS = $(MYSRCS:%.c=$(OBJDIR)/%.o)
+MYOBJS ?= $(MYSRCS:%.c=$(OBJDIR)/%.o)
 CLEAN = $(foreach bin,$(MYLIBS) $(BINS) $(LIB_A),$(BINDIR)/$(bin))
 
 all: $(foreach bin,$(MYLIBS) $(BINS) $(LIB_A),$(BINDIR)/$(bin))
diff --git a/client/Makefile b/client/Makefile
index ebc7f3676..1b128b562 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -42,6 +42,8 @@ REVENGPATH = ./deps/reveng
 REVENGLIB = $(REVENGPATH)/libreveng.a
 AMIIBOLIBPATH = ./deps/amiitool
 AMIIBOLIB = $(AMIIBOLIBPATH)/libamiibo.a
+HARDNESTEDPATH = ./deps/hardnested
+HARDNESTEDLIB = $(HARDNESTEDPATH)/libhardnested.a
 
 # common libraries
 MBEDTLSLIBPATH = ../common/mbedtls
@@ -49,7 +51,7 @@ MBEDTLSLIB = $(OBJDIR)/libmbedtls.a
 ZLIBPATH = ../common/zlib
 ZLIB = $(OBJDIR)/libz.a
 
-LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH)
+LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -I$(HARDNESTEDPATH)
 INCLUDES_CLIENT = -I./src -I./deps -I../include -I../common -I./deps/cliparser -I./src/uart $(LIBS)
 CFLAGS ?= -Wall -Werror -O3
 # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
@@ -204,7 +206,6 @@ CMDSRCS =   crapto1/crapto1.c \
             cmdhfmfu.c \
             cmdhfmfp.c \
             cmdhfmfhard.c \
-            deps/hardnested/hardnested_bruteforce.c \
             cmdhfmfdes.c \
             cmdhftopaz.c \
             cmdhffido.c \
@@ -260,43 +261,11 @@ CMDSRCS =   crapto1/crapto1.c \
             cardhelper.c \
             preferences.c
 
-cpu_arch = $(shell uname -m)
-ifneq ($(findstring 86, $(cpu_arch)), )
-    MULTIARCHSRCS = deps/hardnested/hardnested_bf_core.c deps/hardnested/hardnested_bitarray_core.c
-endif
-ifneq ($(findstring amd64, $(cpu_arch)), )
-    MULTIARCHSRCS = deps/hardnested/hardnested_bf_core.c deps/hardnested/hardnested_bitarray_core.c
-endif
-ifeq ($(MULTIARCHSRCS), )
-    CMDSRCS += deps/hardnested/hardnested_bf_core.c deps/hardnested/hardnested_bitarray_core.c
-endif
 
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 OBJCOBJS = $(OBJCSRCS:%.m=$(OBJDIR)/%.o)
-MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
-            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
-            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
-            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
-            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
-
-SUPPORTS_AVX512 :=  $(shell echo | gcc -E -mavx512f - > /dev/null 2>&1 && echo "True" )
-
-HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2
-HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2
-HARD_SWITCH_SSE2 = -mmmx -msse2 -mno-avx -mno-avx2
-HARD_SWITCH_AVX = -mmmx -msse2 -mavx -mno-avx2
-HARD_SWITCH_AVX2 = -mmmx -msse2 -mavx -mavx2
-HARD_SWITCH_AVX512 = -mmmx -msse2 -mavx -mavx2 -mavx512f
-ifeq "$(SUPPORTS_AVX512)" "True"
-    HARD_SWITCH_NOSIMD += -mno-avx512f
-    HARD_SWITCH_MMX += -mno-avx512f
-    HARD_SWITCH_SSE2 += -mno-avx512f
-    HARD_SWITCH_AVX += -mno-avx512f
-    HARD_SWITCH_AVX2 += -mno-avx512f
-    MULTIARCHOBJS +=  $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
-endif
 
 BINS = proxmark3
 CLEAN = $(BINS) *.moc.cpp ui/ui_overlays.h lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
@@ -309,10 +278,10 @@ all: $(BINS)
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: $(BINS)
 
-proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(ZLIB) $(REVENGLIB) $(AMIIBOLIB) $(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LUALIB) $(JANSSONLIB) $(CBORLIB) $(REVENGLIB) $(MBEDTLSLIB) $(ZLIB) $(AMIIBOLIB) lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
+proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(ZLIB) $(REVENGLIB) $(AMIIBOLIB) $(HARDNESTEDLIB) $(QTLDLIBS)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(LUALIB) $(JANSSONLIB) $(CBORLIB) $(REVENGLIB) $(MBEDTLSLIB) $(ZLIB) $(AMIIBOLIB) $(HARDNESTEDLIB)  lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
 	$(info [=] LD $@)
-	$(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LDLIBS)  -o $@
+	$(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(LDLIBS)  -o $@
 
 src/proxgui.cpp: src/ui/ui_overlays.h
 
@@ -340,6 +309,7 @@ clean:
 	$(Q)$(MAKE) --no-print-directory -C $(CBORLIBPATH) clean
 	$(Q)$(MAKE) --no-print-directory -C $(REVENGPATH) clean
 	$(Q)$(MAKE) --no-print-directory -C $(AMIIBOLIBPATH) clean
+	$(Q)$(MAKE) --no-print-directory -C $(HARDNESTEDPATH) clean
 
 install: all
 	$(info [@] Installing client to $(DESTDIR)$(PREFIX)...)
@@ -384,6 +354,10 @@ $(REVENGLIB):
 	$(info [*] MAKE reveng)
 	$(Q)$(MAKE) --no-print-directory -C $(REVENGPATH) all
 
+$(HARDNESTEDLIB):
+	$(info [*] MAKE hardnested)
+	$(Q)$(MAKE) --no-print-directory -C $(HARDNESTEDPATH) all
+
 $(AMIIBOLIB):
 	$(info [*] MAKE amiibo)
 	$(Q)$(MAKE) --no-print-directory -C $(AMIIBOLIBPATH) all
@@ -402,42 +376,6 @@ $(ZLIB):
 # easy printing of MAKE VARIABLES
 print-%: ; @echo $* = $($*)
 
-$(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%_NOSIMD.d
-	$(info [-] CC(NOSIMD) $<)
-	$(Q)$(MKDIR) $(dir $@)
-	$(Q)$(CC) $(DEPFLAGS:%.Td=%_NOSIMD.Td) $(PM3CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
-	$(Q)$(MV) -f $(OBJDIR)/$*_NOSIMD.Td $(OBJDIR)/$*_NOSIMD.d && $(TOUCH) $@
-
-$(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%_MMX.d
-	$(info [-] CC(MMX) $<)
-	$(Q)$(MKDIR) $(dir $@)
-	$(Q)$(CC) $(DEPFLAGS:%.Td=%_MMX.Td) $(PM3CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
-	$(Q)$(MV) -f $(OBJDIR)/$*_MMX.Td $(OBJDIR)/$*_MMX.d && $(TOUCH) $@
-
-$(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%_SSE2.d
-	$(info [-] CC(SSE2) $<)
-	$(Q)$(MKDIR) $(dir $@)
-	$(Q)$(CC) $(DEPFLAGS:%.Td=%_SSE2.Td) $(PM3CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
-	$(Q)$(MV) -f $(OBJDIR)/$*_SSE2.Td $(OBJDIR)/$*_SSE2.d && $(TOUCH) $@
-
-$(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%_AVX.d
-	$(info [-] CC(AVX) $<)
-	$(Q)$(MKDIR) $(dir $@)
-	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX.Td) $(PM3CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
-	$(Q)$(MV) -f $(OBJDIR)/$*_AVX.Td $(OBJDIR)/$*_AVX.d && $(TOUCH) $@
-
-$(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%_AVX2.d
-	$(info [-] CC(AVX2) $<)
-	$(Q)$(MKDIR) $(dir $@)
-	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX2.Td) $(PM3CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
-	$(Q)$(MV) -f $(OBJDIR)/$*_AVX2.Td $(OBJDIR)/$*_AVX2.d && $(TOUCH) $@
-
-$(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%_AVX512.d
-	$(info [-] CC(AVX512) $<)
-	$(Q)$(MKDIR) $(dir $@)
-	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX512.Td) $(PM3CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
-	$(Q)$(MV) -f $(OBJDIR)/$*_AVX512.Td $(OBJDIR)/$*_AVX512.d && $(TOUCH) $@
-
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
 	$(info [-] CC $<)
@@ -460,7 +398,6 @@ $(OBJDIR)/%.o : %.m $(OBJDIR)/%.d
 	$(Q)$(POSTCOMPILE)
 
 DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(REVENGSRCS)) \
-	$(patsubst %.o, %.d, $(MULTIARCHOBJS)) \
 	$(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
 	$(patsubst %.m, $(OBJDIR)/%.d, $(OBJCSRCS)) \
 	$(OBJDIR)/proxmark3.d
diff --git a/client/deps/hardnested.cmake b/client/deps/hardnested.cmake
index 708203eb7..4e19740c1 100644
--- a/client/deps/hardnested.cmake
+++ b/client/deps/hardnested.cmake
@@ -109,5 +109,11 @@ else ()
 endif ()
 
 add_library(hardnested STATIC
+        hardnested/hardnested_bruteforce.c
         $<TARGET_OBJECTS:hardnested_nosimd>
         ${SIMD_TARGETS})
+target_include_directories(hardnested PRIVATE
+        ../../common
+        ../../include
+        ../src
+        jansson)
diff --git a/client/deps/hardnested/Makefile b/client/deps/hardnested/Makefile
new file mode 100644
index 000000000..84c4ce842
--- /dev/null
+++ b/client/deps/hardnested/Makefile
@@ -0,0 +1,83 @@
+MYSRCPATHS =
+MYINCLUDES = -I../../../common -I../../../include -I../../src -I../jansson
+MYCFLAGS = -std=c99 -D_ISOC99_SOURCE
+MYDEFS =
+MYSRCS = hardnested_bruteforce.c
+
+cpu_arch = $(shell uname -m)
+ifneq ($(findstring 86, $(cpu_arch)), )
+    MULTIARCHSRCS = hardnested_bf_core.c hardnested_bitarray_core.c
+endif
+ifneq ($(findstring amd64, $(cpu_arch)), )
+    MULTIARCHSRCS = hardnested_bf_core.c hardnested_bitarray_core.c
+endif
+ifeq ($(MULTIARCHSRCS), )
+    MYSRCS += hardnested_bf_core.c hardnested_bitarray_core.c
+endif
+
+LIB_A = libhardnested.a
+
+MYOBJS = $(MYSRCS:%.c=$(OBJDIR)/%.o)
+MYOBJS += $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
+            $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
+
+SUPPORTS_AVX512 :=  $(shell echo | gcc -E -mavx512f - > /dev/null 2>&1 && echo "True" )
+
+HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2
+HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2
+HARD_SWITCH_SSE2 = -mmmx -msse2 -mno-avx -mno-avx2
+HARD_SWITCH_AVX = -mmmx -msse2 -mavx -mno-avx2
+HARD_SWITCH_AVX2 = -mmmx -msse2 -mavx -mavx2
+HARD_SWITCH_AVX512 = -mmmx -msse2 -mavx -mavx2 -mavx512f
+ifeq "$(SUPPORTS_AVX512)" "True"
+    HARD_SWITCH_NOSIMD += -mno-avx512f
+    HARD_SWITCH_MMX += -mno-avx512f
+    HARD_SWITCH_SSE2 += -mno-avx512f
+    HARD_SWITCH_AVX += -mno-avx512f
+    HARD_SWITCH_AVX2 += -mno-avx512f
+    MYOBJS +=  $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
+endif
+
+include ../../../Makefile.host
+
+$(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%_NOSIMD.d
+	$(info DEBUG $<)
+
+$(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%_NOSIMD.d
+	$(info [-] CC(NOSIMD) $<)
+	$(Q)$(MKDIR) $(dir $@)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_NOSIMD.Td) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_NOSIMD.Td $(OBJDIR)/$*_NOSIMD.d && $(TOUCH) $@
+
+$(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%_MMX.d
+	$(info [-] CC(MMX) $<)
+	$(Q)$(MKDIR) $(dir $@)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_MMX.Td) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_MMX.Td $(OBJDIR)/$*_MMX.d && $(TOUCH) $@
+
+$(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%_SSE2.d
+	$(info [-] CC(SSE2) $<)
+	$(Q)$(MKDIR) $(dir $@)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_SSE2.Td) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_SSE2.Td $(OBJDIR)/$*_SSE2.d && $(TOUCH) $@
+
+$(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%_AVX.d
+	$(info [-] CC(AVX) $<)
+	$(Q)$(MKDIR) $(dir $@)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX.Td) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_AVX.Td $(OBJDIR)/$*_AVX.d && $(TOUCH) $@
+
+$(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%_AVX2.d
+	$(info [-] CC(AVX2) $<)
+	$(Q)$(MKDIR) $(dir $@)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX2.Td) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_AVX2.Td $(OBJDIR)/$*_AVX2.d && $(TOUCH) $@
+
+$(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%_AVX512.d
+	$(info [-] CC(AVX512) $<)
+	$(Q)$(MKDIR) $(dir $@)
+	$(Q)$(CC) $(DEPFLAGS:%.Td=%_AVX512.Td) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
+	$(Q)$(MV) -f $(OBJDIR)/$*_AVX512.Td $(OBJDIR)/$*_AVX512.d && $(TOUCH) $@
diff --git a/client/deps/tinycbor.cmake b/client/deps/tinycbor.cmake
index b3247d1e7..14ebb5326 100644
--- a/client/deps/tinycbor.cmake
+++ b/client/deps/tinycbor.cmake
@@ -10,4 +10,5 @@ add_library(tinycbor STATIC
         )
 
 target_include_directories(tinycbor INTERFACE tinycbor)
+# Strange errors on Mingw when compiling with -O3
 target_compile_options(tinycbor PRIVATE -Wall -Werror -O2)