diff --git a/binr/rabin2/meson.build b/binr/rabin2/meson.build
index 25f55af7f5..3ff3c441cb 100644
--- a/binr/rabin2/meson.build
+++ b/binr/rabin2/meson.build
@@ -4,9 +4,9 @@ executable('rabin2', 'rabin2.c',
     '../../libr/include',
 	platform_binrinc
   ]),
-  link_with: [r_util, r_cons, r_config, r_hash, r_io, r_crypto, r_core],
+  link_with: [r_util, r_cons, r_config, r_hash, r_io, r_crypto, r_core, r_magic],
   objects: [
-    r_sdb.extract_all_objects(),
+    libr2sdb.extract_all_objects(),
 	r_bin.extract_all_objects()
   ],
   install: true
diff --git a/binr/radare2/meson.build b/binr/radare2/meson.build
index b22435532d..330d094880 100644
--- a/binr/radare2/meson.build
+++ b/binr/radare2/meson.build
@@ -3,6 +3,6 @@ executable('radare2', 'radare2.c',
     '../../libr/include',
 	platform_binrinc
   ]),
-  link_with: [r_util, r_socket, r_core],
+  link_with: [r_util, r_socket, r_core, r_io, r_magic, r_fs, r_bin, r_flag, r_cons, r_asm, r_debug, r_config, r_bp, r_reg, r_syscall, r_anal, r_parse, r_egg, r_search, r_hash, r_crypto,],
   install: true
-)
+)
\ No newline at end of file
diff --git a/binr/rasm2/meson.build b/binr/rasm2/meson.build
index 5f69dbd024..8754e770f0 100644
--- a/binr/rasm2/meson.build
+++ b/binr/rasm2/meson.build
@@ -5,6 +5,6 @@ executable('rasm2', 'rasm2.c',
 	platform_binrinc
 	
   ]),
-  link_with: [r_util, r_asm, r_anal],
+  link_with: [r_util, r_asm, r_anal, r_syscall],
   install: true
 )
diff --git a/libr/anal/meson.build b/libr/anal/meson.build
index d9c8e2c7b6..def77b3848 100644
--- a/libr/anal/meson.build
+++ b/libr/anal/meson.build
@@ -93,9 +93,9 @@ r_anal = shared_library('r_anal', files,
   c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
   link_with: [r_util, r_reg, r_syscall, r_search, r_cons],
   objects: [
-    capstone.extract_all_objects(),
-	r_sdb.extract_all_objects(),
-	spp.extract_all_objects(),
+    libr2capstone.extract_all_objects(),
+	libr2sdb.extract_all_objects(),
+	libr2spp.extract_all_objects(),
   ],
   install: true
 )
diff --git a/libr/asm/meson.build b/libr/asm/meson.build
index 89abfefdcc..dddb005217 100644
--- a/libr/asm/meson.build
+++ b/libr/asm/meson.build
@@ -1,89 +1,3 @@
-spp_files=[
-  '../../shlr/spp/spp.c'
-]
-
-spp = static_library('spp', spp_files,
-  include_directories: include_directories([
-    '../../shlr/spp/',
-	'../../libr/include',
-	platform_librinc
-  ]),
-  c_args: ['-DHAVE_R_UTIL']
-  )
-
-cs_files=[
-'../../shlr/capstone//arch/AArch64/AArch64BaseInfo.c',
-'../../shlr/capstone//arch/AArch64/AArch64Disassembler.c',
-'../../shlr/capstone//arch/AArch64/AArch64InstPrinter.c',
-'../../shlr/capstone//arch/AArch64/AArch64Mapping.c',
-'../../shlr/capstone//arch/AArch64/AArch64Module.c',
-'../../shlr/capstone//arch/ARM/ARMDisassembler.c',
-'../../shlr/capstone//arch/ARM/ARMInstPrinter.c',
-'../../shlr/capstone//arch/ARM/ARMMapping.c',
-'../../shlr/capstone//arch/ARM/ARMModule.c',
-'../../shlr/capstone//arch/M68K/M68KDisassembler.c',
-'../../shlr/capstone//arch/M68K/M68KInstPrinter.c',
-'../../shlr/capstone//arch/M68K/M68KModule.c',
-'../../shlr/capstone//arch/Mips/MipsDisassembler.c',
-'../../shlr/capstone//arch/Mips/MipsInstPrinter.c',
-'../../shlr/capstone//arch/Mips/MipsMapping.c',
-'../../shlr/capstone//arch/Mips/MipsModule.c',
-'../../shlr/capstone//arch/PowerPC/PPCDisassembler.c',
-'../../shlr/capstone//arch/PowerPC/PPCInstPrinter.c',
-'../../shlr/capstone//arch/PowerPC/PPCMapping.c',
-'../../shlr/capstone//arch/PowerPC/PPCModule.c',
-'../../shlr/capstone//arch/Sparc/SparcDisassembler.c',
-'../../shlr/capstone//arch/Sparc/SparcInstPrinter.c',
-'../../shlr/capstone//arch/Sparc/SparcMapping.c',
-'../../shlr/capstone//arch/Sparc/SparcModule.c',
-'../../shlr/capstone//arch/SystemZ/SystemZDisassembler.c',
-'../../shlr/capstone//arch/SystemZ/SystemZInstPrinter.c',
-'../../shlr/capstone//arch/SystemZ/SystemZMapping.c',
-'../../shlr/capstone//arch/SystemZ/SystemZMCTargetDesc.c',
-'../../shlr/capstone//arch/SystemZ/SystemZModule.c',
-'../../shlr/capstone//arch/TMS320C64x/TMS320C64xDisassembler.c',
-'../../shlr/capstone//arch/TMS320C64x/TMS320C64xInstPrinter.c',
-'../../shlr/capstone//arch/TMS320C64x/TMS320C64xMapping.c',
-'../../shlr/capstone//arch/TMS320C64x/TMS320C64xModule.c',
-'../../shlr/capstone//arch/X86/X86ATTInstPrinter.c',
-'../../shlr/capstone//arch/X86/X86Disassembler.c',
-'../../shlr/capstone//arch/X86/X86DisassemblerDecoder.c',
-'../../shlr/capstone//arch/X86/X86IntelInstPrinter.c',
-'../../shlr/capstone//arch/X86/X86Mapping.c',
-'../../shlr/capstone//arch/X86/X86Module.c',
-'../../shlr/capstone//arch/XCore/XCoreDisassembler.c',
-'../../shlr/capstone//arch/XCore/XCoreInstPrinter.c',
-'../../shlr/capstone//arch/XCore/XCoreMapping.c',
-'../../shlr/capstone//arch/XCore/XCoreModule.c',
-'../../shlr/capstone//cs.c',
-'../../shlr/capstone//MCInst.c',
-'../../shlr/capstone//MCInstrDesc.c',
-'../../shlr/capstone//MCRegisterInfo.c',
-'../../shlr/capstone//SStream.c',
-'../../shlr/capstone//utils.c',
-]
-
-capstone = static_library('capstone', cs_files,
-  c_args: [
-    '-DCAPSTONE_X86_ATT_DISABLE_NO',
-    '-DCAPSTONE_X86_REDUCE_NO',
-    '-DCAPSTONE_USE_SYS_DYN_MEM',
-    '-DCAPSTONE_DIET_NO',
-    '-DCAPSTONE_HAS_ARM',
-    '-DCAPSTONE_HAS_ARM64',
-    '-DCAPSTONE_HAS_M68K',
-    '-DCAPSTONE_HAS_MIPS',
-    '-DCAPSTONE_HAS_POWERPC',
-    '-DCAPSTONE_HAS_SPARC',
-    '-DCAPSTONE_HAS_SYSZ',
-    '-DCAPSTONE_HAS_X86',
-    '-DCAPSTONE_HAS_XCORE',
-    '-DCAPSTONE_HAS_TMS320C64X',
-  ],
-  include_directories: include_directories([
-    '../../shlr/capstone/include'
-  ]))
-
 files=[
 'asm.c',
 'code.c',
@@ -246,9 +160,9 @@ r_asm = shared_library('r_asm', files,
   c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
   link_with: [r_util, r_syscall, r_parse, r_lang, r_flag,r_socket],
   objects: [
-    capstone.extract_all_objects(),
-	r_sdb.extract_all_objects(),
-	spp.extract_all_objects(),
+    libr2capstone.extract_all_objects(),
+	libr2sdb.extract_all_objects(),
+	libr2spp.extract_all_objects(),
   ],
   install: true
 )
diff --git a/libr/bin/meson.build b/libr/bin/meson.build
index df4a37730e..2b45a02d8e 100644
--- a/libr/bin/meson.build
+++ b/libr/bin/meson.build
@@ -115,7 +115,7 @@ r_bin = shared_library('r_bin', files,
   c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
   link_with: [r_util, r_io, r_socket, r_magic],
   objects: [
-    r_sdb.extract_all_objects()
+    libr2sdb.extract_all_objects()
   ],
   install: true
 )
diff --git a/libr/config/meson.build b/libr/config/meson.build
index 8cfcb535f9..095ee014d9 100644
--- a/libr/config/meson.build
+++ b/libr/config/meson.build
@@ -10,7 +10,7 @@ r_config = shared_library('r_config', files,
   ]),
   link_with: [r_util],
   objects: [
-    r_sdb.extract_all_objects()
+    libr2sdb.extract_all_objects()
   ],
   install: true
 )
diff --git a/libr/cons/meson.build b/libr/cons/meson.build
index d0d39023b2..50e4c8002a 100644
--- a/libr/cons/meson.build
+++ b/libr/cons/meson.build
@@ -25,7 +25,7 @@ r_cons = shared_library('r_cons', files,
   ),
   link_with: [r_util],
   objects: [
-    r_sdb.extract_all_objects()
+    libr2sdb.extract_all_objects()
   ],
   install: true
 )
diff --git a/libr/core/meson.build b/libr/core/meson.build
index 0b05a6dfed..235dece75e 100644
--- a/libr/core/meson.build
+++ b/libr/core/meson.build
@@ -59,35 +59,17 @@ files=[
 'yank.c'
 ]
 
-gdbr_files=[
-  '../../shlr/gdb/src/arch.c',
-  '../../shlr/gdb/src/common.c',
-  '../../shlr/gdb/src/libgdbr.c',
-  '../../shlr/gdb/src/packet.c',
-  '../../shlr/gdb/src/utils.c',
-  '../../shlr/gdb/src/gdbclient/core.c',
-  '../../shlr/gdb/src/gdbclient/responses.c',
-  '../../shlr/gdb/src/gdbserver/core.c'
-]
-
-gdbr = static_library('gdbr', gdbr_files,
-  include_directories: include_directories([
-  '../../shlr/gdb/include',
-  '../../libr/include',
-  platform_librinc
-  ]))
-
 r_core = shared_library('r_core', files,
   include_directories: include_directories([
   '../include','../../shlr',
   platform_librinc
   ]),
   c_args: ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_reg, r_syscall, r_search, r_cons, r_anal, r_socket, r_io, r_fs, r_lang, r_hash, r_flag, r_parse, r_egg, r_debug, r_magic, r_crypto, r_config, r_bin],
+  link_with: [r_util, r_reg, r_syscall, r_search, r_cons, r_anal, r_socket, r_io, r_fs, r_lang, r_hash, r_flag, r_parse, r_egg, r_debug, r_magic, r_crypto, r_config, r_bin, r_asm, r_bp],
   objects: [
-    r_sdb.extract_all_objects(),
-	spp.extract_all_objects(),
-	gdbr.extract_all_objects()
+    libr2sdb.extract_all_objects(),
+	libr2spp.extract_all_objects(),
+	libr2gdb.extract_all_objects()
   ],
   install: true
 )
diff --git a/libr/debug/meson.build b/libr/debug/meson.build
index 9043780dc8..dda72a3d50 100644
--- a/libr/debug/meson.build
+++ b/libr/debug/meson.build
@@ -66,7 +66,7 @@ r_debug = shared_library('r_debug', files,
   c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
   link_with: [r_util, r_hash, r_reg, r_syscall, r_anal, r_flag, r_io, r_bp, r_search, r_cons, r_lang, r_egg],
   objects: [
-    r_sdb.extract_all_objects(),
+    libr2sdb.extract_all_objects(),
   ],
   install: true
 )
diff --git a/libr/egg/meson.build b/libr/egg/meson.build
index 439df8c4ff..167882e6cd 100644
--- a/libr/egg/meson.build
+++ b/libr/egg/meson.build
@@ -20,9 +20,9 @@ r_egg = shared_library('r_egg', files,
   platform_librinc
   ]),
   c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_asm],
+  link_with: [r_util, r_asm, r_syscall],
   objects: [
-    r_sdb.extract_all_objects(),
+    libr2sdb.extract_all_objects(),
   ],
   install: true
 )
diff --git a/libr/flag/meson.build b/libr/flag/meson.build
index 9d94d13ad9..85a3c68c99 100644
--- a/libr/flag/meson.build
+++ b/libr/flag/meson.build
@@ -13,7 +13,7 @@ r_flag = shared_library('r_flag', files,
   ]),
   link_with: [r_util],
   objects: [
-    r_sdb.extract_all_objects()
+    libr2sdb.extract_all_objects()
   ],  
   install: true
 )
diff --git a/libr/fs/meson.build b/libr/fs/meson.build
index 26baa3a169..4065c6a2b7 100644
--- a/libr/fs/meson.build
+++ b/libr/fs/meson.build
@@ -1,64 +1,3 @@
-grub_files=[
-'../../shlr/grub//fs/affs.c',
-#'../../shlr/grub//fs/afs.c',
-#'../../shlr/grub//fs/afs_be.c',
-#'../../shlr/grub//fs/befs.c',
-#'../../shlr/grub//fs/befs_be.c',
-'../../shlr/grub//fs/btrfs.c',
-#'../../shlr/grub//fs/cpio.c',
-'../../shlr/grub//fs/ext2.c',
-'../../shlr/grub//fs/fat.c',
-'../../shlr/grub//fs/fb.c',
-'../../shlr/grub//fs/fshelp.c',
-'../../shlr/grub//fs/hfs.c',
-'../../shlr/grub//fs/hfsplus.c',
-'../../shlr/grub//fs/iso9660.c',
-'../../shlr/grub//fs/jfs.c',
-'../../shlr/grub//fs/minix.c',
-'../../shlr/grub//fs/minix2.c',
-'../../shlr/grub//fs/nilfs2.c',
-'../../shlr/grub//fs/ntfs.c',
-'../../shlr/grub//fs/ntfscomp.c',
-'../../shlr/grub//fs/reiserfs.c',
-'../../shlr/grub//fs/sfs.c',
-'../../shlr/grub//fs/tar.c',
-'../../shlr/grub//fs/udf.c',
-'../../shlr/grub//fs/ufs.c',
-'../../shlr/grub//fs/ufs2.c',
-'../../shlr/grub//fs/xfs.c',
-'../../shlr/grub//grubfs.c',
-'../../shlr/grub//kern/device.c',
-'../../shlr/grub//kern/disk.c',
-#'../../shlr/grub//kern/dl.c',
-'../../shlr/grub//kern/env.c',
-'../../shlr/grub//kern/err.c',
-'../../shlr/grub//kern/file.c',
-'../../shlr/grub//kern/fs.c',
-'../../shlr/grub//kern/list.c',
-'../../shlr/grub//kern/misc.c',
-'../../shlr/grub//kern/mm.c',
-'../../shlr/grub//kern/partition.c',
-'../../shlr/grub//kern/term.c',
-'../../shlr/grub//kern/time.c',
-#'../../shlr/grub//main.c',
-#'../../shlr/grub//partmap/acorn.c',
-'../../shlr/grub//partmap/amiga.c',
-'../../shlr/grub//partmap/apple.c',
-'../../shlr/grub//partmap/bsdlabel.c',
-'../../shlr/grub//partmap/gpt.c',
-'../../shlr/grub//partmap/msdos.c',
-'../../shlr/grub//partmap/sun.c',
-'../../shlr/grub//partmap/sunpc.c',
-]
-grub = static_library('grub', grub_files,
-  include_directories: include_directories([
-    '../../libr/include',
-    '../../shlr/',
-    '../../shlr/grub/include',
-	platform_librinc
-  ])
-)
-
 files=[
 'file.c',
 'fs.c',
@@ -92,7 +31,7 @@ r_fs = shared_library('r_fs', files,
     platform_librinc,
   ]),
   c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, grub],
+  link_with: [r_util, libr2grub],
   install: true
 )
 
diff --git a/libr/include/r_types_base.h b/libr/include/r_types_base.h
index 320efe045b..cfb2d79856 100644
--- a/libr/include/r_types_base.h
+++ b/libr/include/r_types_base.h
@@ -131,6 +131,8 @@ typedef struct _utX{
 #endif
 #ifdef _MSC_VER
 #define R_PACKED( __Declaration__ ) __pragma( pack(push, 1) ) __Declaration__ __pragma( pack(pop) )
+#undef INFINITY
+#undef NAN
 #elif defined(__GNUC__)
 #define R_PACKED( __Declaration__ ) __Declaration__ __attribute__((__packed__))
 #endif
diff --git a/libr/io/meson.build b/libr/io/meson.build
index ae65202f86..f95c96950c 100644
--- a/libr/io/meson.build
+++ b/libr/io/meson.build
@@ -30,12 +30,17 @@ files=[
 'p/io_shm.c',
 'p/io_sparse.c',
 'p/io_tcp.c',
-#'p/io_w32.c',
-#'p/io_w32dbg.c',
 #'p/io_windbg.c',
+#'p/io_gdb.c',
 #'p/io_zip.c',
 ]
 
+#'p/io_bochs.c',
+#'p/io_qnx.c',
+#'p/io_windbg.c',
+#'p/io_gdb.c',
+#'p/io_zip.c',
+
 if host_os == 'linux'
 files += [
   'p/io_r2k_linux.c',
@@ -45,6 +50,8 @@ endif
 if host_os == 'windows'
 files += [
   'p/io_r2k_windows.c',
+  'p/io_w32.c',
+  'p/io_w32dbg.c',
 ]
 endif
 
diff --git a/libr/meson.build b/libr/meson.build
index 8faefa98cc..1915deb7d8 100644
--- a/libr/meson.build
+++ b/libr/meson.build
@@ -208,6 +208,12 @@ io = [
 	'sparse',
 	'tcp'
 ]
+if host_os == 'windows'
+io += [
+	'w32dbg',
+	'w32',
+]
+endif
 
 lang = [
 	'vala'
diff --git a/libr/parse/meson.build b/libr/parse/meson.build
index e70258dadc..fc69d81829 100644
--- a/libr/parse/meson.build
+++ b/libr/parse/meson.build
@@ -15,14 +15,6 @@ files=[
 'p/parse_mreplace/mmemory.c'
 ]
 
-tcc = static_library('tcc', [
-'../../shlr/tcc/libtcc.c',
-'../../shlr/tcc/tccgen.c',
-'../../shlr/tcc/tccpp.c'
-],
-include_directories: include_directories(['../include', '../../shlr/tcc']),
-)
-
 r_parse = shared_library('r_parse', files,
   include_directories: include_directories([
   '.',
@@ -31,7 +23,7 @@ r_parse = shared_library('r_parse', files,
   platform_librinc
   ]),
   c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_flag, r_syscall, r_reg, tcc],
+  link_with: [r_util, r_flag, r_syscall, r_reg, libr2tcc],
   install: true
 )
 
diff --git a/libr/syscall/meson.build b/libr/syscall/meson.build
index 08afc977d2..3deb4e1a92 100644
--- a/libr/syscall/meson.build
+++ b/libr/syscall/meson.build
@@ -10,7 +10,7 @@ r_syscall = shared_library('r_syscall', files,
   ),
   link_with: [r_util],
   objects: [
-    r_sdb.extract_all_objects()
+    libr2sdb.extract_all_objects()
   ],
   install: true
 )
diff --git a/libr/util/meson.build b/libr/util/meson.build
index ea3496e8bd..124d3fa323 100644
--- a/libr/util/meson.build
+++ b/libr/util/meson.build
@@ -73,144 +73,6 @@ files=[
 ]
 
 incdir = '../include'
-
-sdb_files=[
-'../../shlr/sdb/src/array.c',
-'../../shlr/sdb/src/base64.c',
-'../../shlr/sdb/src/buffer.c',
-'../../shlr/sdb/src/cdb.c',
-'../../shlr/sdb/src/cdb_make.c',
-'../../shlr/sdb/src/disk.c',
-'../../shlr/sdb/src/fmt.c',
-'../../shlr/sdb/src/ht.c',
-'../../shlr/sdb/src/journal.c',
-'../../shlr/sdb/src/json.c',
-'../../shlr/sdb/src/lock.c',
-'../../shlr/sdb/src/ls.c',
-# '../../shlr/sdb/src/main.c',
-'../../shlr/sdb/src/match.c',
-'../../shlr/sdb/src/ns.c',
-'../../shlr/sdb/src/num.c',
-'../../shlr/sdb/src/query.c',
-'../../shlr/sdb/src/sdb.c',
-'../../shlr/sdb/src/sdbht.c',
-'../../shlr/sdb/src/util.c'
-]
-
-zlib_files=[
-'../../shlr/zip/zip/zip_add.c',
-'../../shlr/zip/zip/zip_add_dir.c',
-'../../shlr/zip/zip/zip_add_entry.c',
-'../../shlr/zip/zip/zip_close.c',
-'../../shlr/zip/zip/zip_delete.c',
-'../../shlr/zip/zip/zip_dir_add.c',
-'../../shlr/zip/zip/zip_dirent.c',
-'../../shlr/zip/zip/zip_discard.c',
-'../../shlr/zip/zip/zip_entry.c',
-'../../shlr/zip/zip/zip_err_str.c',
-'../../shlr/zip/zip/zip_error.c',
-'../../shlr/zip/zip/zip_error_clear.c',
-'../../shlr/zip/zip/zip_error_get.c',
-'../../shlr/zip/zip/zip_error_get_sys_type.c',
-'../../shlr/zip/zip/zip_error_strerror.c',
-'../../shlr/zip/zip/zip_error_to_str.c',
-'../../shlr/zip/zip/zip_extra_field.c',
-'../../shlr/zip/zip/zip_extra_field_api.c',
-'../../shlr/zip/zip/zip_fclose.c',
-'../../shlr/zip/zip/zip_fdopen.c',
-'../../shlr/zip/zip/zip_file_add.c',
-'../../shlr/zip/zip/zip_file_error_clear.c',
-'../../shlr/zip/zip/zip_file_error_get.c',
-'../../shlr/zip/zip/zip_file_get_comment.c',
-'../../shlr/zip/zip/zip_file_get_offset.c',
-'../../shlr/zip/zip/zip_file_rename.c',
-'../../shlr/zip/zip/zip_file_replace.c',
-'../../shlr/zip/zip/zip_file_set_comment.c',
-'../../shlr/zip/zip/zip_file_strerror.c',
-'../../shlr/zip/zip/zip_filerange_crc.c',
-'../../shlr/zip/zip/zip_fopen.c',
-'../../shlr/zip/zip/zip_fopen_encrypted.c',
-'../../shlr/zip/zip/zip_fopen_index.c',
-'../../shlr/zip/zip/zip_fopen_index_encrypted.c',
-'../../shlr/zip/zip/zip_fread.c',
-'../../shlr/zip/zip/zip_get_archive_comment.c',
-'../../shlr/zip/zip/zip_get_archive_flag.c',
-'../../shlr/zip/zip/zip_get_compression_implementation.c',
-'../../shlr/zip/zip/zip_get_encryption_implementation.c',
-'../../shlr/zip/zip/zip_get_file_comment.c',
-'../../shlr/zip/zip/zip_get_name.c',
-'../../shlr/zip/zip/zip_get_num_entries.c',
-'../../shlr/zip/zip/zip_get_num_files.c',
-'../../shlr/zip/zip/zip_name_locate.c',
-'../../shlr/zip/zip/zip_new.c',
-'../../shlr/zip/zip/zip_open.c',
-'../../shlr/zip/zip/zip_rename.c',
-'../../shlr/zip/zip/zip_replace.c',
-'../../shlr/zip/zip/zip_set_archive_comment.c',
-'../../shlr/zip/zip/zip_set_archive_flag.c',
-'../../shlr/zip/zip/zip_set_default_password.c',
-'../../shlr/zip/zip/zip_set_file_comment.c',
-'../../shlr/zip/zip/zip_set_file_compression.c',
-'../../shlr/zip/zip/zip_set_name.c',
-'../../shlr/zip/zip/zip_source_buffer.c',
-'../../shlr/zip/zip/zip_source_close.c',
-'../../shlr/zip/zip/zip_source_crc.c',
-'../../shlr/zip/zip/zip_source_deflate.c',
-'../../shlr/zip/zip/zip_source_error.c',
-'../../shlr/zip/zip/zip_source_file.c',
-'../../shlr/zip/zip/zip_source_filep.c',
-'../../shlr/zip/zip/zip_source_free.c',
-'../../shlr/zip/zip/zip_source_function.c',
-'../../shlr/zip/zip/zip_source_layered.c',
-'../../shlr/zip/zip/zip_source_open.c',
-'../../shlr/zip/zip/zip_source_pkware.c',
-'../../shlr/zip/zip/zip_source_pop.c',
-'../../shlr/zip/zip/zip_source_read.c',
-'../../shlr/zip/zip/zip_source_stat.c',
-'../../shlr/zip/zip/zip_source_window.c',
-'../../shlr/zip/zip/zip_source_zip.c',
-'../../shlr/zip/zip/zip_source_zip_new.c',
-'../../shlr/zip/zip/zip_stat.c',
-'../../shlr/zip/zip/zip_stat_index.c',
-'../../shlr/zip/zip/zip_stat_init.c',
-'../../shlr/zip/zip/zip_strerror.c',
-'../../shlr/zip/zip/zip_string.c',
-'../../shlr/zip/zip/zip_unchange.c',
-'../../shlr/zip/zip/zip_unchange_all.c',
-'../../shlr/zip/zip/zip_unchange_archive.c',
-'../../shlr/zip/zip/zip_unchange_data.c',
-'../../shlr/zip/zip/zip_utf-8.c',
-'../../shlr/zip/zlib/adler32.c',
-'../../shlr/zip/zlib/compress.c',
-'../../shlr/zip/zlib/crc32.c',
-'../../shlr/zip/zlib/deflate.c',
-'../../shlr/zip/zlib/gzclose.c',
-'../../shlr/zip/zlib/gzlib.c',
-'../../shlr/zip/zlib/gzread.c',
-'../../shlr/zip/zlib/gzwrite.c',
-'../../shlr/zip/zlib/infback.c',
-'../../shlr/zip/zlib/inffast.c',
-'../../shlr/zip/zlib/inflate.c',
-'../../shlr/zip/zlib/inftrees.c',
-'../../shlr/zip/zlib/trees.c',
-'../../shlr/zip/zlib/uncompr.c',
-'../../shlr/zip/zlib/zutil.c'
-]
-
-r_sdb = static_library('r_sdb', sdb_files,
-  include_directories: include_directories([
-  '../../shlr/sdb/src',
-  '../../libr/include/sdb',
-  platform_librinc
-  ]))
-
-r_zip = static_library('r_zip', zlib_files,
-  include_directories: include_directories([
-    '../../libr/include',
-    '../../shlr/zip/include',
-	platform_librinc
-  ]))
-
 r_util = shared_library('r_util', files,
   include_directories: include_directories([
 	incdir,
@@ -219,8 +81,8 @@ r_util = shared_library('r_util', files,
   ),
   dependencies: [ldl, pth, utl],
   objects: [
-    r_sdb.extract_all_objects(),
-	r_zip.extract_all_objects()
+    libr2sdb.extract_all_objects(),
+	libr2zip.extract_all_objects()
   ],
   install: true
 )
diff --git a/meson.build b/meson.build
index d01c2e03ab..2a654b253b 100644
--- a/meson.build
+++ b/meson.build
@@ -24,19 +24,23 @@ endif
 
 platform_librinc = []
 platform_binrinc = []
+platform_shlrinc = []
 
 if host_machine.system() == 'windows'
   platform_deps = [cc.find_library('ws2_32')] 
   platform_librinc  = ['../include/msvc']
   platform_binrinc  = ['../../libr/include/msvc']
+  platform_shlrinc  = ['../libr/include/msvc']
   host_os = 'windows'
 else
   platform_librinc = '.'
 endif
+
+subdir('shlr/')
+
 subdir('libr/util')
 subdir('binr/rax2')
 
-
 #'/usr/include'
 
 # load plugin configuration
@@ -83,7 +87,7 @@ versionconf.set('DATE', r2birth)
 configure_file(input : 'libr/include/r_version.h.in',
                output : 'r_version.h',
                configuration : versionconf)
-
+		   
 subdir('libr/hash')
 subdir('libr/crypto')
 subdir('libr/socket')
diff --git a/shlr/meson.build b/shlr/meson.build
new file mode 100644
index 0000000000..545df63be6
--- /dev/null
+++ b/shlr/meson.build
@@ -0,0 +1,366 @@
+bochs_files=[
+'bochs/src/libbochs.c'
+]
+
+libr2bochs = static_library('libr2bochs', bochs_files,
+  include_directories: include_directories([
+  'bochs/include',
+  '../libr/include',
+  platform_shlrinc
+  ]))
+
+gdb_files=[
+'gdb/src/arch.c',
+'gdb/src/common.c',
+'gdb/src/packet.c',
+'gdb/src/utils.c',
+'gdb/src/libgdbr.c',
+
+'gdb/src/gdbclient/core.c',
+'gdb/src/gdbclient/responses.c',
+
+'gdb/src/gdbserver/core.c',
+]
+
+libr2gdb = static_library('libr2gdb', gdb_files,
+  include_directories: include_directories([
+  'gdb/include',
+  'gdb/include/gdbclient',
+  'gdb/include/gdbserver ',
+  '../libr/include',
+  platform_shlrinc
+  ]))
+
+java_files=[
+'java/class.c',
+'java/code.c',
+'java/dsojson.c',
+'java/ops.c',
+#'java/main.c',
+]
+
+libr2java = static_library('libr2java', java_files,
+  include_directories: include_directories([
+  'java',
+  '../libr/include',
+  platform_shlrinc
+  ]))
+
+qnx_files=[
+'qnx/src/core.c',
+'qnx/src/libqnxr.c',
+'qnx/src/packet.c',
+'qnx/src/sigutil.c',
+'qnx/src/utils.c',
+]
+
+libr2qnx = static_library('libr2qnx', qnx_files,
+  include_directories: include_directories([
+  'qnx/include',
+  '../libr/include',
+  platform_shlrinc
+  ]))
+
+tcc_files=[
+'tcc/libtcc.c',
+'tcc/tccgen.c',
+'tcc/tccpp.c'
+]  
+
+libr2tcc = static_library('libr2tcc', tcc_files,
+  include_directories: include_directories([
+  'tcc',
+  '../libr/include',
+  platform_shlrinc
+  ]))
+  
+spp_files=[
+  'spp/spp.c'
+]
+
+libr2spp = static_library('libr2spp', spp_files,
+  include_directories: include_directories([
+    'spp/',
+	'../libr/include',
+	platform_shlrinc
+  ]),
+  c_args: ['-DHAVE_R_UTIL']
+  )  
+  
+  
+sdb_files=[
+'sdb/src/array.c',
+'sdb/src/base64.c',
+'sdb/src/buffer.c',
+'sdb/src/cdb.c',
+'sdb/src/cdb_make.c',
+'sdb/src/disk.c',
+'sdb/src/fmt.c',
+'sdb/src/ht.c',
+'sdb/src/journal.c',
+'sdb/src/json.c',
+'sdb/src/lock.c',
+'sdb/src/ls.c',
+# 'sdb/src/main.c',
+'sdb/src/match.c',
+'sdb/src/ns.c',
+'sdb/src/num.c',
+'sdb/src/query.c',
+'sdb/src/sdb.c',
+'sdb/src/sdbht.c',
+'sdb/src/util.c'
+]
+
+libr2sdb = static_library('libr2sdb', sdb_files,
+  include_directories: include_directories([
+  'sdb/src',
+  '../libr/include/sdb',
+  platform_shlrinc
+  ]))
+
+
+zlib_files=[
+'zip/zip/zip_add.c',
+'zip/zip/zip_add_dir.c',
+'zip/zip/zip_add_entry.c',
+'zip/zip/zip_close.c',
+'zip/zip/zip_delete.c',
+'zip/zip/zip_dir_add.c',
+'zip/zip/zip_dirent.c',
+'zip/zip/zip_discard.c',
+'zip/zip/zip_entry.c',
+'zip/zip/zip_err_str.c',
+'zip/zip/zip_error.c',
+'zip/zip/zip_error_clear.c',
+'zip/zip/zip_error_get.c',
+'zip/zip/zip_error_get_sys_type.c',
+'zip/zip/zip_error_strerror.c',
+'zip/zip/zip_error_to_str.c',
+'zip/zip/zip_extra_field.c',
+'zip/zip/zip_extra_field_api.c',
+'zip/zip/zip_fclose.c',
+'zip/zip/zip_fdopen.c',
+'zip/zip/zip_file_add.c',
+'zip/zip/zip_file_error_clear.c',
+'zip/zip/zip_file_error_get.c',
+'zip/zip/zip_file_get_comment.c',
+'zip/zip/zip_file_get_offset.c',
+'zip/zip/zip_file_rename.c',
+'zip/zip/zip_file_replace.c',
+'zip/zip/zip_file_set_comment.c',
+'zip/zip/zip_file_strerror.c',
+'zip/zip/zip_filerange_crc.c',
+'zip/zip/zip_fopen.c',
+'zip/zip/zip_fopen_encrypted.c',
+'zip/zip/zip_fopen_index.c',
+'zip/zip/zip_fopen_index_encrypted.c',
+'zip/zip/zip_fread.c',
+'zip/zip/zip_get_archive_comment.c',
+'zip/zip/zip_get_archive_flag.c',
+'zip/zip/zip_get_compression_implementation.c',
+'zip/zip/zip_get_encryption_implementation.c',
+'zip/zip/zip_get_file_comment.c',
+'zip/zip/zip_get_name.c',
+'zip/zip/zip_get_num_entries.c',
+'zip/zip/zip_get_num_files.c',
+'zip/zip/zip_name_locate.c',
+'zip/zip/zip_new.c',
+'zip/zip/zip_open.c',
+'zip/zip/zip_rename.c',
+'zip/zip/zip_replace.c',
+'zip/zip/zip_set_archive_comment.c',
+'zip/zip/zip_set_archive_flag.c',
+'zip/zip/zip_set_default_password.c',
+'zip/zip/zip_set_file_comment.c',
+'zip/zip/zip_set_file_compression.c',
+'zip/zip/zip_set_name.c',
+'zip/zip/zip_source_buffer.c',
+'zip/zip/zip_source_close.c',
+'zip/zip/zip_source_crc.c',
+'zip/zip/zip_source_deflate.c',
+'zip/zip/zip_source_error.c',
+'zip/zip/zip_source_file.c',
+'zip/zip/zip_source_filep.c',
+'zip/zip/zip_source_free.c',
+'zip/zip/zip_source_function.c',
+'zip/zip/zip_source_layered.c',
+'zip/zip/zip_source_open.c',
+'zip/zip/zip_source_pkware.c',
+'zip/zip/zip_source_pop.c',
+'zip/zip/zip_source_read.c',
+'zip/zip/zip_source_stat.c',
+'zip/zip/zip_source_window.c',
+'zip/zip/zip_source_zip.c',
+'zip/zip/zip_source_zip_new.c',
+'zip/zip/zip_stat.c',
+'zip/zip/zip_stat_index.c',
+'zip/zip/zip_stat_init.c',
+'zip/zip/zip_strerror.c',
+'zip/zip/zip_string.c',
+'zip/zip/zip_unchange.c',
+'zip/zip/zip_unchange_all.c',
+'zip/zip/zip_unchange_archive.c',
+'zip/zip/zip_unchange_data.c',
+'zip/zip/zip_utf-8.c',
+'zip/zlib/adler32.c',
+'zip/zlib/compress.c',
+'zip/zlib/crc32.c',
+'zip/zlib/deflate.c',
+'zip/zlib/gzclose.c',
+'zip/zlib/gzlib.c',
+'zip/zlib/gzread.c',
+'zip/zlib/gzwrite.c',
+'zip/zlib/infback.c',
+'zip/zlib/inffast.c',
+'zip/zlib/inflate.c',
+'zip/zlib/inftrees.c',
+'zip/zlib/trees.c',
+'zip/zlib/uncompr.c',
+'zip/zlib/zutil.c'
+]
+
+
+libr2zip = static_library('libr2zip', zlib_files,
+  include_directories: include_directories([
+  'zip/include',
+  '../libr/include',
+  platform_shlrinc
+  ]))  
+  
+  
+cs_files=[
+'capstone/arch/AArch64/AArch64BaseInfo.c',
+'capstone/arch/AArch64/AArch64Disassembler.c',
+'capstone/arch/AArch64/AArch64InstPrinter.c',
+'capstone/arch/AArch64/AArch64Mapping.c',
+'capstone/arch/AArch64/AArch64Module.c',
+'capstone/arch/ARM/ARMDisassembler.c',
+'capstone/arch/ARM/ARMInstPrinter.c',
+'capstone/arch/ARM/ARMMapping.c',
+'capstone/arch/ARM/ARMModule.c',
+'capstone/arch/M68K/M68KDisassembler.c',
+'capstone/arch/M68K/M68KInstPrinter.c',
+'capstone/arch/M68K/M68KModule.c',
+'capstone/arch/Mips/MipsDisassembler.c',
+'capstone/arch/Mips/MipsInstPrinter.c',
+'capstone/arch/Mips/MipsMapping.c',
+'capstone/arch/Mips/MipsModule.c',
+'capstone/arch/PowerPC/PPCDisassembler.c',
+'capstone/arch/PowerPC/PPCInstPrinter.c',
+'capstone/arch/PowerPC/PPCMapping.c',
+'capstone/arch/PowerPC/PPCModule.c',
+'capstone/arch/Sparc/SparcDisassembler.c',
+'capstone/arch/Sparc/SparcInstPrinter.c',
+'capstone/arch/Sparc/SparcMapping.c',
+'capstone/arch/Sparc/SparcModule.c',
+'capstone/arch/SystemZ/SystemZDisassembler.c',
+'capstone/arch/SystemZ/SystemZInstPrinter.c',
+'capstone/arch/SystemZ/SystemZMapping.c',
+'capstone/arch/SystemZ/SystemZMCTargetDesc.c',
+'capstone/arch/SystemZ/SystemZModule.c',
+'capstone/arch/TMS320C64x/TMS320C64xDisassembler.c',
+'capstone/arch/TMS320C64x/TMS320C64xInstPrinter.c',
+'capstone/arch/TMS320C64x/TMS320C64xMapping.c',
+'capstone/arch/TMS320C64x/TMS320C64xModule.c',
+'capstone/arch/X86/X86ATTInstPrinter.c',
+'capstone/arch/X86/X86Disassembler.c',
+'capstone/arch/X86/X86DisassemblerDecoder.c',
+'capstone/arch/X86/X86IntelInstPrinter.c',
+'capstone/arch/X86/X86Mapping.c',
+'capstone/arch/X86/X86Module.c',
+'capstone/arch/XCore/XCoreDisassembler.c',
+'capstone/arch/XCore/XCoreInstPrinter.c',
+'capstone/arch/XCore/XCoreMapping.c',
+'capstone/arch/XCore/XCoreModule.c',
+'capstone/cs.c',
+'capstone/MCInst.c',
+'capstone/MCInstrDesc.c',
+'capstone/MCRegisterInfo.c',
+'capstone/SStream.c',
+'capstone/utils.c',
+]
+
+libr2capstone = static_library('libr2capstone', cs_files,
+  c_args: [
+    '-DCAPSTONE_X86_ATT_DISABLE_NO',
+    '-DCAPSTONE_X86_REDUCE_NO',
+    '-DCAPSTONE_USE_SYS_DYN_MEM',
+    '-DCAPSTONE_DIET_NO',
+    '-DCAPSTONE_HAS_ARM',
+    '-DCAPSTONE_HAS_ARM64',
+    '-DCAPSTONE_HAS_M68K',
+    '-DCAPSTONE_HAS_MIPS',
+    '-DCAPSTONE_HAS_POWERPC',
+    '-DCAPSTONE_HAS_SPARC',
+    '-DCAPSTONE_HAS_SYSZ',
+    '-DCAPSTONE_HAS_X86',
+    '-DCAPSTONE_HAS_XCORE',
+    '-DCAPSTONE_HAS_TMS320C64X',
+  ],
+  include_directories: include_directories([
+    'capstone/include'
+  ]))
+  
+grub_files=[
+'grub/fs/affs.c',
+#'grub/fs/afs.c',
+#'grub/fs/afs_be.c',
+#'grub/fs/befs.c',
+#'grub/fs/befs_be.c',
+'grub/fs/btrfs.c',
+#'grub/fs/cpio.c',
+'grub/fs/ext2.c',
+'grub/fs/fat.c',
+'grub/fs/fb.c',
+'grub/fs/fshelp.c',
+'grub/fs/hfs.c',
+'grub/fs/hfsplus.c',
+'grub/fs/iso9660.c',
+'grub/fs/jfs.c',
+'grub/fs/minix.c',
+'grub/fs/minix2.c',
+'grub/fs/nilfs2.c',
+'grub/fs/ntfs.c',
+'grub/fs/ntfscomp.c',
+'grub/fs/reiserfs.c',
+'grub/fs/sfs.c',
+'grub/fs/tar.c',
+'grub/fs/udf.c',
+'grub/fs/ufs.c',
+'grub/fs/ufs2.c',
+'grub/fs/xfs.c',
+'grub/grubfs.c',
+'grub/kern/device.c',
+'grub/kern/disk.c',
+#'grub/kern/dl.c',
+'grub/kern/env.c',
+'grub/kern/err.c',
+'grub/kern/file.c',
+'grub/kern/fs.c',
+'grub/kern/list.c',
+'grub/kern/misc.c',
+'grub/kern/mm.c',
+'grub/kern/partition.c',
+'grub/kern/term.c',
+'grub/kern/time.c',
+#'grub/main.c',
+#'grub/partmap/acorn.c',
+'grub/partmap/amiga.c',
+'grub/partmap/apple.c',
+'grub/partmap/bsdlabel.c',
+'grub/partmap/gpt.c',
+'grub/partmap/msdos.c',
+'grub/partmap/sun.c',
+'grub/partmap/sunpc.c',
+]
+
+libr2grub = static_library('libr2grub', grub_files,
+  include_directories: include_directories([
+    'grub',
+    'grub/include',
+    '../libr/include',
+	platform_shlrinc
+  ])
+)
+  
+  
\ No newline at end of file