diff --git a/Makefile b/Makefile
index ab87afdc1e..6fe24e9f37 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ TAR=bsdtar cvf
 TAREXT=tar.gz
 CZ=gzip -f
 endif
-PWD=$(shell pwd | sed -e 's,^/c/,/,')
+PWD=$(shell pwd)
 
 all: plugins.cfg
 	${MAKE} -C shlr/zip
diff --git a/libr/Makefile b/libr/Makefile
index 7288f5b998..78d8c08a3e 100644
--- a/libr/Makefile
+++ b/libr/Makefile
@@ -7,7 +7,7 @@ PREFIX?=${PWD}/../prefix
 PFX=$(call rmdblslash,${DESTDIR}/${PREFIX})
 LFX=$(call rmdblslash,${DESTDIR}/${LIBDIR})
 IFX=$(call rmdblslash,${DESTDIR}/${INCLUDEDIR})
-PWD=$(call rmdblslash,$(shell pwd |sed -e 's,^/c/,/,'))
+PWD=$(call rmdblslash,$(shell pwd))
 
 LIBS0=util hash
 LIBS1=reg cons db magic diff bp search config socket
diff --git a/libr/anal/p/8051.mk b/libr/anal/p/8051.mk
index a916082f55..708bc91384 100644
--- a/libr/anal/p/8051.mk
+++ b/libr/anal/p/8051.mk
@@ -1,7 +1,9 @@
 OBJ_8051=anal_8051.o
 
 STATIC_OBJ+=${OBJ_8051}
-OBJ_8051+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/8051/8051.o
+#OBJ_8051+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/8051/8051.o
+#OBJ_8051+=${LTOP}/asm/arch/8051/8051.o
+OBJ_8051+=../../asm/arch/8051/8051.o
 TARGET_8051=anal_8051.${EXT_SO}
 
 ALL_TARGETS+=${TARGET_8051}
diff --git a/libr/anal/p/cr16.mk b/libr/anal/p/cr16.mk
index 3aea6813da..eca129c155 100644
--- a/libr/anal/p/cr16.mk
+++ b/libr/anal/p/cr16.mk
@@ -1,7 +1,8 @@
 OBJ_CR16=anal_cr16.o
 
 STATIC_OBJ+=${OBJ_CR16}
-OBJ_CR16+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/cr16/cr16_disas.o
+#OBJ_CR16+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/cr16/cr16_disas.o
+OBJ_CR16+=../../asm/arch/cr16/cr16_disas.o
 TARGET_CR16=anal_cr16.${EXT_SO}
 
 ALL_TARGETS+=${TARGET_CR16}
diff --git a/libr/anal/p/ebc.mk b/libr/anal/p/ebc.mk
index ab59b6c56d..70ee283777 100644
--- a/libr/anal/p/ebc.mk
+++ b/libr/anal/p/ebc.mk
@@ -1,7 +1,8 @@
 OBJ_EBC=anal_ebc.o
 
 STATIC_OBJ+=${OBJ_EBC}
-OBJ_EBC+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/ebc/ebc_disas.o
+#OBJ_EBC+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/ebc/ebc_disas.o
+OBJ_EBC+=../../asm/arch/ebc/ebc_disas.o
 TARGET_EBC=anal_ebc.${EXT_SO}
 
 ALL_TARGETS+=${TARGET_EBC}
diff --git a/libr/anal/p/h8300.mk b/libr/anal/p/h8300.mk
index 505e391a35..dba53a29d0 100644
--- a/libr/anal/p/h8300.mk
+++ b/libr/anal/p/h8300.mk
@@ -1,7 +1,8 @@
 OBJ_H8300=anal_h8300.o
 
 STATIC_OBJ+=${OBJ_H8300}
-OBJ_H8300+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/h8300/h8300_disas.o
+#OBJ_H8300+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/h8300/h8300_disas.o
+OBJ_H8300+=../../asm/arch/h8300/h8300_disas.o
 TARGET_H8300=anal_h8300.${EXT_SO}
 
 ALL_TARGETS+=${TARGET_H8300}
diff --git a/libr/anal/p/tms320.mk b/libr/anal/p/tms320.mk
index a8e9e78685..304a51886d 100644
--- a/libr/anal/p/tms320.mk
+++ b/libr/anal/p/tms320.mk
@@ -3,15 +3,16 @@ OBJ_TMS320+=anal_tms320_c55x_plus.o
 
 STATIC_OBJ+=${OBJ_TMS320}
 #OBJ_TMS320+=../../../../../../../../../../../${LTOP}/asm/arch/tms320/tms320_dasm.o
-ROOT=../../../../../../../../../../../../../../../../../../../../../
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/tms320_dasm.o
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/ins.o
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/c55plus.o
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/c55plus_decode.o
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/decode_funcs.o
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/utils.o
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/hashtable.o
-OBJ_TMS320+=$(ROOT)/${LTOP}/asm/arch/tms320/c55x_plus/hashvector.o
+#ROOT=../../../../../../../../../../../../../../../../../../../../../${LTOP}
+ROOT=../../
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/tms320_dasm.o
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/c55x_plus/ins.o
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/c55x_plus/c55plus.o
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/c55x_plus/c55plus_decode.o
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/c55x_plus/decode_funcs.o
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/c55x_plus/utils.o
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/c55x_plus/hashtable.o
+OBJ_TMS320+=$(ROOT)/asm/arch/tms320/c55x_plus/hashvector.o
 TARGET_TMS320=anal_tms320.${EXT_SO}
 
 ALL_TARGETS+=${TARGET_TMS320}
diff --git a/libr/anal/p/v850.mk b/libr/anal/p/v850.mk
index 79756879a5..630bc0dc25 100644
--- a/libr/anal/p/v850.mk
+++ b/libr/anal/p/v850.mk
@@ -1,7 +1,8 @@
 OBJ_V850=anal_v850.o
 
 STATIC_OBJ+=${OBJ_V850}
-OBJ_V850+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/v850/v850_disas.o
+#OBJ_V850+=../../../../../../../../../../../../../../../../../../../../${LTOP}/asm/arch/v850/v850_disas.o
+OBJ_V850+=../../asm/arch/v850/v850_disas.o
 TARGET_V850=anal_v850.${EXT_SO}
 
 ALL_TARGETS+=${TARGET_V850}
diff --git a/libr/asm/d/Makefile b/libr/asm/d/Makefile
index 09b28d86dd..0e9dd9c767 100644
--- a/libr/asm/d/Makefile
+++ b/libr/asm/d/Makefile
@@ -22,7 +22,7 @@ install: ${F_SDB}
 	cp -f *.sdb "${OPDIR}"
 
 #that sed is a workaround for mingw's pwd
-CWD=$(shell pwd | sed -e 's,^/c/,/,')
+CWD=$(shell pwd)
 symstall install-symlink: ${F_SDB}
 	mkdir -p "${OPDIR}"
 	for a in *.sdb ; do ln -fs "${CWD}/$$a" "${OPDIR}/$$a" ; done
diff --git a/libr/include/r_types.h b/libr/include/r_types.h
index 05084c0889..8019f69906 100644
--- a/libr/include/r_types.h
+++ b/libr/include/r_types.h
@@ -28,6 +28,11 @@
 #define __KFBSD__ 0
 #endif
 
+#if __MINGW32__ || __MINGW64__
+#undef MINGW32
+#define MINGW32 1
+#endif
+
 #if defined(EMSCRIPTEN) || defined(__linux__) || defined(__APPLE__) || defined(__GNU__) || defined(__ANDROID__) || defined(__QNX__)
   #define __BSD__ 0
   #define __UNIX__ 1