98 files changed, 6 insertions, 6 deletions
diff --git a/code/build.sh b/code/build.sh
index a71b792..f08ad7e 100755
--- a/code/build.sh
+++ b/code/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-subdirs="core util test"
+subdirs="ecp util test"
 
 for i in $subdirs; do
 	(cd $i && make $1 && cd ..) || exit;
diff --git a/code/core/Makefile b/code/ecp/Makefile
index 88d8c84..88d8c84 100644
--- a/code/core/Makefile
+++ b/code/ecp/Makefile
diff --git a/code/core/TODO b/code/ecp/TODO
index f48cd69..f48cd69 100644
--- a/code/core/TODO
+++ b/code/ecp/TODO
diff --git a/code/core/core.c b/code/ecp/core.c
index f81bbc6..f81bbc6 100644
--- a/code/core/core.c
+++ b/code/ecp/core.c
diff --git a/code/core/core.h b/code/ecp/core.h
index ce81d9d..ce81d9d 100644
--- a/code/core/core.h
+++ b/code/ecp/core.h
diff --git a/code/core/crypto/Makefile b/code/ecp/crypto/Makefile
index a7145c7..a7145c7 100644
--- a/code/core/crypto/Makefile
+++ b/code/ecp/crypto/Makefile
diff --git a/code/core/crypto/chacha/Makefile b/code/ecp/crypto/chacha/Makefile
index 8a977ae..8a977ae 100644
--- a/code/core/crypto/chacha/Makefile
+++ b/code/ecp/crypto/chacha/Makefile
diff --git a/code/core/crypto/chacha/chacha-merged.c b/code/ecp/crypto/chacha/chacha-merged.c
index 557dfd5..557dfd5 100644
--- a/code/core/crypto/chacha/chacha-merged.c
+++ b/code/ecp/crypto/chacha/chacha-merged.c
diff --git a/code/core/crypto/chacha/chacha.c b/code/ecp/crypto/chacha/chacha.c
index fba03c9..fba03c9 100644
--- a/code/core/crypto/chacha/chacha.c
+++ b/code/ecp/crypto/chacha/chacha.c
diff --git a/code/core/crypto/compat/Makefile b/code/ecp/crypto/compat/Makefile
index 1afe391..1afe391 100644
--- a/code/core/crypto/compat/Makefile
+++ b/code/ecp/crypto/compat/Makefile
diff --git a/code/core/crypto/compat/arc4random.c b/code/ecp/crypto/compat/arc4random.c
index 0d3a64f..0d3a64f 100644
--- a/code/core/crypto/compat/arc4random.c
+++ b/code/ecp/crypto/compat/arc4random.c
diff --git a/code/core/crypto/compat/arc4random.h b/code/ecp/crypto/compat/arc4random.h
index 762aec2..762aec2 100644
--- a/code/core/crypto/compat/arc4random.h
+++ b/code/ecp/crypto/compat/arc4random.h
diff --git a/code/core/crypto/compat/arc4random_aix.h b/code/ecp/crypto/compat/arc4random_aix.h
index 3142a1f..3142a1f 100644
--- a/code/core/crypto/compat/arc4random_aix.h
+++ b/code/ecp/crypto/compat/arc4random_aix.h
diff --git a/code/core/crypto/compat/arc4random_freebsd.h b/code/ecp/crypto/compat/arc4random_freebsd.h
index 3faa5e4..3faa5e4 100644
--- a/code/core/crypto/compat/arc4random_freebsd.h
+++ b/code/ecp/crypto/compat/arc4random_freebsd.h
diff --git a/code/core/crypto/compat/arc4random_hpux.h b/code/ecp/crypto/compat/arc4random_hpux.h
index 2a3fe8c..2a3fe8c 100644
--- a/code/core/crypto/compat/arc4random_hpux.h
+++ b/code/ecp/crypto/compat/arc4random_hpux.h
diff --git a/code/core/crypto/compat/arc4random_linux.h b/code/ecp/crypto/compat/arc4random_linux.h
index 879f966..879f966 100644
--- a/code/core/crypto/compat/arc4random_linux.h
+++ b/code/ecp/crypto/compat/arc4random_linux.h
diff --git a/code/core/crypto/compat/arc4random_netbsd.h b/code/ecp/crypto/compat/arc4random_netbsd.h
index 611997d..611997d 100644
--- a/code/core/crypto/compat/arc4random_netbsd.h
+++ b/code/ecp/crypto/compat/arc4random_netbsd.h
diff --git a/code/core/crypto/compat/arc4random_osx.h b/code/ecp/crypto/compat/arc4random_osx.h
index 818ae6b..818ae6b 100644
--- a/code/core/crypto/compat/arc4random_osx.h
+++ b/code/ecp/crypto/compat/arc4random_osx.h
diff --git a/code/core/crypto/compat/arc4random_solaris.h b/code/ecp/crypto/compat/arc4random_solaris.h
index b1084cd..b1084cd 100644
--- a/code/core/crypto/compat/arc4random_solaris.h
+++ b/code/ecp/crypto/compat/arc4random_solaris.h
diff --git a/code/core/crypto/compat/arc4random_uniform.c b/code/ecp/crypto/compat/arc4random_uniform.c
index 2d22434..2d22434 100644
--- a/code/core/crypto/compat/arc4random_uniform.c
+++ b/code/ecp/crypto/compat/arc4random_uniform.c
diff --git a/code/core/crypto/compat/arc4random_win.h b/code/ecp/crypto/compat/arc4random_win.h
index deec8a1..deec8a1 100644
--- a/code/core/crypto/compat/arc4random_win.h
+++ b/code/ecp/crypto/compat/arc4random_win.h
diff --git a/code/core/crypto/compat/chacha_private.h b/code/ecp/crypto/compat/chacha_private.h
index 7c3680f..7c3680f 100644
--- a/code/core/crypto/compat/chacha_private.h
+++ b/code/ecp/crypto/compat/chacha_private.h
diff --git a/code/core/crypto/compat/explicit_bzero.c b/code/ecp/crypto/compat/explicit_bzero.c
index 5dd0103..5dd0103 100644
--- a/code/core/crypto/compat/explicit_bzero.c
+++ b/code/ecp/crypto/compat/explicit_bzero.c
diff --git a/code/core/crypto/compat/getentropy_aix.c b/code/ecp/crypto/compat/getentropy_aix.c
index b046412..b046412 100644
--- a/code/core/crypto/compat/getentropy_aix.c
+++ b/code/ecp/crypto/compat/getentropy_aix.c
diff --git a/code/core/crypto/compat/getentropy_freebsd.c b/code/ecp/crypto/compat/getentropy_freebsd.c
index 30cd68e..30cd68e 100644
--- a/code/core/crypto/compat/getentropy_freebsd.c
+++ b/code/ecp/crypto/compat/getentropy_freebsd.c
diff --git a/code/core/crypto/compat/getentropy_hpux.c b/code/ecp/crypto/compat/getentropy_hpux.c
index a74e53c..a74e53c 100644
--- a/code/core/crypto/compat/getentropy_hpux.c
+++ b/code/ecp/crypto/compat/getentropy_hpux.c
diff --git a/code/core/crypto/compat/getentropy_linux.c b/code/ecp/crypto/compat/getentropy_linux.c
index 37362e9..37362e9 100644
--- a/code/core/crypto/compat/getentropy_linux.c
+++ b/code/ecp/crypto/compat/getentropy_linux.c
diff --git a/code/core/crypto/compat/getentropy_netbsd.c b/code/ecp/crypto/compat/getentropy_netbsd.c
index 45d68c9..45d68c9 100644
--- a/code/core/crypto/compat/getentropy_netbsd.c
+++ b/code/ecp/crypto/compat/getentropy_netbsd.c
diff --git a/code/core/crypto/compat/getentropy_osx.c b/code/ecp/crypto/compat/getentropy_osx.c
index 44a313c..44a313c 100644
--- a/code/core/crypto/compat/getentropy_osx.c
+++ b/code/ecp/crypto/compat/getentropy_osx.c
diff --git a/code/core/crypto/compat/getentropy_solaris.c b/code/ecp/crypto/compat/getentropy_solaris.c
index 017a2cf..017a2cf 100644
--- a/code/core/crypto/compat/getentropy_solaris.c
+++ b/code/ecp/crypto/compat/getentropy_solaris.c
diff --git a/code/core/crypto/compat/getentropy_win.c b/code/ecp/crypto/compat/getentropy_win.c
index 2abeb27..2abeb27 100644
--- a/code/core/crypto/compat/getentropy_win.c
+++ b/code/ecp/crypto/compat/getentropy_win.c
diff --git a/code/core/crypto/compat/timingsafe_bcmp.c b/code/ecp/crypto/compat/timingsafe_bcmp.c
index 552e844..552e844 100644
--- a/code/core/crypto/compat/timingsafe_bcmp.c
+++ b/code/ecp/crypto/compat/timingsafe_bcmp.c
diff --git a/code/core/crypto/compat/timingsafe_memcmp.c b/code/ecp/crypto/compat/timingsafe_memcmp.c
index bb210a3..bb210a3 100644
--- a/code/core/crypto/compat/timingsafe_memcmp.c
+++ b/code/ecp/crypto/compat/timingsafe_memcmp.c
diff --git a/code/core/crypto/crypto.c b/code/ecp/crypto/crypto.c
index f57e8d8..f57e8d8 100644
--- a/code/core/crypto/crypto.c
+++ b/code/ecp/crypto/crypto.c
diff --git a/code/core/crypto/crypto.h b/code/ecp/crypto/crypto.h
index 7bd27d5..7bd27d5 100644
--- a/code/core/crypto/crypto.h
+++ b/code/ecp/crypto/crypto.h
diff --git a/code/core/crypto/curve25519/Makefile b/code/ecp/crypto/curve25519/Makefile
index c3f94f0..c3f94f0 100644
--- a/code/core/crypto/curve25519/Makefile
+++ b/code/ecp/crypto/curve25519/Makefile
diff --git a/code/core/crypto/curve25519/curve25519-generic.c b/code/ecp/crypto/curve25519/curve25519-generic.c
index e7373d2..e7373d2 100644
--- a/code/core/crypto/curve25519/curve25519-generic.c
+++ b/code/ecp/crypto/curve25519/curve25519-generic.c
diff --git a/code/core/crypto/curve25519/curve25519.c b/code/ecp/crypto/curve25519/curve25519.c
index f5f57e6..f5f57e6 100644
--- a/code/core/crypto/curve25519/curve25519.c
+++ b/code/ecp/crypto/curve25519/curve25519.c
diff --git a/code/core/crypto/curve25519/curve25519_internal.h b/code/ecp/crypto/curve25519/curve25519_internal.h
index f80424a..f80424a 100644
--- a/code/core/crypto/curve25519/curve25519_internal.h
+++ b/code/ecp/crypto/curve25519/curve25519_internal.h
diff --git a/code/core/crypto/e_chacha20poly1305.c b/code/ecp/crypto/e_chacha20poly1305.c
index 17fcab8..17fcab8 100644
--- a/code/core/crypto/e_chacha20poly1305.c
+++ b/code/ecp/crypto/e_chacha20poly1305.c
diff --git a/code/core/crypto/include/chacha.h b/code/ecp/crypto/include/chacha.h
index 25a3ef3..25a3ef3 100644
--- a/code/core/crypto/include/chacha.h
+++ b/code/ecp/crypto/include/chacha.h
diff --git a/code/core/crypto/include/compat.h b/code/ecp/crypto/include/compat.h
index 12fb3f4..12fb3f4 100644
--- a/code/core/crypto/include/compat.h
+++ b/code/ecp/crypto/include/compat.h
diff --git a/code/core/crypto/include/curve25519.h b/code/ecp/crypto/include/curve25519.h
index a7092cb..a7092cb 100644
--- a/code/core/crypto/include/curve25519.h
+++ b/code/ecp/crypto/include/curve25519.h
diff --git a/code/core/crypto/include/machine/endian.h b/code/ecp/crypto/include/machine/endian.h
index 5ec39af..5ec39af 100644
--- a/code/core/crypto/include/machine/endian.h
+++ b/code/ecp/crypto/include/machine/endian.h
diff --git a/code/core/crypto/include/md32_common.h b/code/ecp/crypto/include/md32_common.h
index 7a6e893..7a6e893 100644
--- a/code/core/crypto/include/md32_common.h
+++ b/code/ecp/crypto/include/md32_common.h
diff --git a/code/core/crypto/include/poly1305.h b/code/ecp/crypto/include/poly1305.h
index d7af3df..d7af3df 100644
--- a/code/core/crypto/include/poly1305.h
+++ b/code/ecp/crypto/include/poly1305.h
diff --git a/code/core/crypto/include/sha.h b/code/ecp/crypto/include/sha.h
index 93af5d9..93af5d9 100644
--- a/code/core/crypto/include/sha.h
+++ b/code/ecp/crypto/include/sha.h
diff --git a/code/core/crypto/poly1305/Makefile b/code/ecp/crypto/poly1305/Makefile
index 6bc384f..6bc384f 100644
--- a/code/core/crypto/poly1305/Makefile
+++ b/code/ecp/crypto/poly1305/Makefile
diff --git a/code/core/crypto/poly1305/poly1305-donna.c b/code/ecp/crypto/poly1305/poly1305-donna.c
index 773ea4e..773ea4e 100644
--- a/code/core/crypto/poly1305/poly1305-donna.c
+++ b/code/ecp/crypto/poly1305/poly1305-donna.c
diff --git a/code/core/crypto/poly1305/poly1305.c b/code/ecp/crypto/poly1305/poly1305.c
index 5f3f111..5f3f111 100644
--- a/code/core/crypto/poly1305/poly1305.c
+++ b/code/ecp/crypto/poly1305/poly1305.c
diff --git a/code/core/crypto/sha/Makefile b/code/ecp/crypto/sha/Makefile
index 1eb727f..1eb727f 100644
--- a/code/core/crypto/sha/Makefile
+++ b/code/ecp/crypto/sha/Makefile
diff --git a/code/core/crypto/sha/sha1-elf-x86_64.S b/code/ecp/crypto/sha/sha1-elf-x86_64.S
index d7ef2bf..d7ef2bf 100644
--- a/code/core/crypto/sha/sha1-elf-x86_64.S
+++ b/code/ecp/crypto/sha/sha1-elf-x86_64.S
diff --git a/code/core/crypto/sha/sha1-macosx-x86_64.S b/code/ecp/crypto/sha/sha1-macosx-x86_64.S
index f5c2c36..f5c2c36 100644
--- a/code/core/crypto/sha/sha1-macosx-x86_64.S
+++ b/code/ecp/crypto/sha/sha1-macosx-x86_64.S
diff --git a/code/core/crypto/sha/sha1_one.c b/code/ecp/crypto/sha/sha1_one.c
index 080ea4d..080ea4d 100644
--- a/code/core/crypto/sha/sha1_one.c
+++ b/code/ecp/crypto/sha/sha1_one.c
diff --git a/code/core/crypto/sha/sha1dgst.c b/code/ecp/crypto/sha/sha1dgst.c
index acc576c..acc576c 100644
--- a/code/core/crypto/sha/sha1dgst.c
+++ b/code/ecp/crypto/sha/sha1dgst.c
diff --git a/code/core/crypto/sha/sha256-elf-x86_64.S b/code/ecp/crypto/sha/sha256-elf-x86_64.S
index 599a5cb..599a5cb 100644
--- a/code/core/crypto/sha/sha256-elf-x86_64.S
+++ b/code/ecp/crypto/sha/sha256-elf-x86_64.S
diff --git a/code/core/crypto/sha/sha256-macosx-x86_64.S b/code/ecp/crypto/sha/sha256-macosx-x86_64.S
index 3ecafca..3ecafca 100644
--- a/code/core/crypto/sha/sha256-macosx-x86_64.S
+++ b/code/ecp/crypto/sha/sha256-macosx-x86_64.S
diff --git a/code/core/crypto/sha/sha256.c b/code/ecp/crypto/sha/sha256.c
index ee22321..ee22321 100644
--- a/code/core/crypto/sha/sha256.c
+++ b/code/ecp/crypto/sha/sha256.c
diff --git a/code/core/crypto/sha/sha512-elf-x86_64.S b/code/ecp/crypto/sha/sha512-elf-x86_64.S
index d218304..d218304 100644
--- a/code/core/crypto/sha/sha512-elf-x86_64.S
+++ b/code/ecp/crypto/sha/sha512-elf-x86_64.S
diff --git a/code/core/crypto/sha/sha512-macosx-x86_64.S b/code/ecp/crypto/sha/sha512-macosx-x86_64.S
index 4a51d14..4a51d14 100644
--- a/code/core/crypto/sha/sha512-macosx-x86_64.S
+++ b/code/ecp/crypto/sha/sha512-macosx-x86_64.S
diff --git a/code/core/crypto/sha/sha512.c b/code/ecp/crypto/sha/sha512.c
index 364c85c..364c85c 100644
--- a/code/core/crypto/sha/sha512.c
+++ b/code/ecp/crypto/sha/sha512.c
diff --git a/code/core/crypto/sha/sha_locl.h b/code/ecp/crypto/sha/sha_locl.h
index f6d305d..f6d305d 100644
--- a/code/core/crypto/sha/sha_locl.h
+++ b/code/ecp/crypto/sha/sha_locl.h
diff --git a/code/core/crypto/test/Makefile b/code/ecp/crypto/test/Makefile
index 2a5fa3e..2a5fa3e 100644
--- a/code/core/crypto/test/Makefile
+++ b/code/ecp/crypto/test/Makefile
diff --git a/code/core/crypto/test/aead.c b/code/ecp/crypto/test/aead.c
index a2e0da7..a2e0da7 100644
--- a/code/core/crypto/test/aead.c
+++ b/code/ecp/crypto/test/aead.c
diff --git a/code/core/crypto/test/aead_dec.c b/code/ecp/crypto/test/aead_dec.c
index 7deb587..7deb587 100644
--- a/code/core/crypto/test/aead_dec.c
+++ b/code/ecp/crypto/test/aead_dec.c
diff --git a/code/core/crypto/test/aead_enc.c b/code/ecp/crypto/test/aead_enc.c
index a103490..a103490 100644
--- a/code/core/crypto/test/aead_enc.c
+++ b/code/ecp/crypto/test/aead_enc.c
diff --git a/code/core/crypto/test/ed25519.c b/code/ecp/crypto/test/ed25519.c
index 21334cb..21334cb 100644
--- a/code/core/crypto/test/ed25519.c
+++ b/code/ecp/crypto/test/ed25519.c
diff --git a/code/core/crypto/test/ed25519_open.c b/code/ecp/crypto/test/ed25519_open.c
index 66f32f5..66f32f5 100644
--- a/code/core/crypto/test/ed25519_open.c
+++ b/code/ecp/crypto/test/ed25519_open.c
diff --git a/code/core/crypto/test/ed25519_sign.c b/code/ecp/crypto/test/ed25519_sign.c
index da098bd..da098bd 100644
--- a/code/core/crypto/test/ed25519_sign.c
+++ b/code/ecp/crypto/test/ed25519_sign.c
diff --git a/code/core/fe310/Makefile b/code/ecp/fe310/Makefile
index 6dd42e2..6dd42e2 100644
--- a/code/core/fe310/Makefile
+++ b/code/ecp/fe310/Makefile
diff --git a/code/core/fe310/time.c b/code/ecp/fe310/time.c
index 2ff98cb..2ff98cb 100644
--- a/code/core/fe310/time.c
+++ b/code/ecp/fe310/time.c
diff --git a/code/core/fe310/transport.c b/code/ecp/fe310/transport.c
index b833ee3..b833ee3 100644
--- a/code/core/fe310/transport.c
+++ b/code/ecp/fe310/transport.c
diff --git a/code/core/fe310/transport.h b/code/ecp/fe310/transport.h
index c35e13e..c35e13e 100644
--- a/code/core/fe310/transport.h
+++ b/code/ecp/fe310/transport.h
diff --git a/code/core/htable/Makefile b/code/ecp/htable/Makefile
index eb73403..eb73403 100644
--- a/code/core/htable/Makefile
+++ b/code/ecp/htable/Makefile
diff --git a/code/core/htable/hashtable.c b/code/ecp/htable/hashtable.c
index de15827..de15827 100755
--- a/code/core/htable/hashtable.c
+++ b/code/ecp/htable/hashtable.c
diff --git a/code/core/htable/hashtable.h b/code/ecp/htable/hashtable.h
index 046f740..046f740 100755
--- a/code/core/htable/hashtable.h
+++ b/code/ecp/htable/hashtable.h
diff --git a/code/core/htable/hashtable_itr.c b/code/ecp/htable/hashtable_itr.c
index 3ee8fe2..3ee8fe2 100755
--- a/code/core/htable/hashtable_itr.c
+++ b/code/ecp/htable/hashtable_itr.c
diff --git a/code/core/htable/hashtable_itr.h b/code/ecp/htable/hashtable_itr.h
index 658ae83..658ae83 100755
--- a/code/core/htable/hashtable_itr.h
+++ b/code/ecp/htable/hashtable_itr.h
diff --git a/code/core/htable/hashtable_private.h b/code/ecp/htable/hashtable_private.h
index 2330b00..2330b00 100755
--- a/code/core/htable/hashtable_private.h
+++ b/code/ecp/htable/hashtable_private.h
diff --git a/code/core/htable/htable.c b/code/ecp/htable/htable.c
index 6330ef8..6330ef8 100644
--- a/code/core/htable/htable.c
+++ b/code/ecp/htable/htable.c
diff --git a/code/core/msgq.c b/code/ecp/msgq.c
index b928a2d..b928a2d 100644
--- a/code/core/msgq.c
+++ b/code/ecp/msgq.c
diff --git a/code/core/msgq.h b/code/ecp/msgq.h
index 41e819b..41e819b 100644
--- a/code/core/msgq.h
+++ b/code/ecp/msgq.h
diff --git a/code/core/posix/Makefile b/code/ecp/posix/Makefile
index 6dd42e2..6dd42e2 100644
--- a/code/core/posix/Makefile
+++ b/code/ecp/posix/Makefile
diff --git a/code/core/posix/time.c b/code/ecp/posix/time.c
index c7a238a..c7a238a 100644
--- a/code/core/posix/time.c
+++ b/code/ecp/posix/time.c
diff --git a/code/core/posix/transport.c b/code/ecp/posix/transport.c
index df8e0f5..df8e0f5 100644
--- a/code/core/posix/transport.c
+++ b/code/ecp/posix/transport.c
diff --git a/code/core/posix/transport.h b/code/ecp/posix/transport.h
index c35e13e..c35e13e 100644
--- a/code/core/posix/transport.h
+++ b/code/ecp/posix/transport.h
diff --git a/code/core/rbuf.c b/code/ecp/rbuf.c
index b5f66a9..b5f66a9 100644
--- a/code/core/rbuf.c
+++ b/code/ecp/rbuf.c
diff --git a/code/core/rbuf.h b/code/ecp/rbuf.h
index 145234f..145234f 100644
--- a/code/core/rbuf.h
+++ b/code/ecp/rbuf.h
diff --git a/code/core/rbuf_recv.c b/code/ecp/rbuf_recv.c
index 44b5113..44b5113 100644
--- a/code/core/rbuf_recv.c
+++ b/code/ecp/rbuf_recv.c
diff --git a/code/core/rbuf_send.c b/code/ecp/rbuf_send.c
index f913e7e..f913e7e 100644
--- a/code/core/rbuf_send.c
+++ b/code/ecp/rbuf_send.c
diff --git a/code/core/timer.c b/code/ecp/timer.c
index 691f75c..691f75c 100644
--- a/code/core/timer.c
+++ b/code/ecp/timer.c
diff --git a/code/core/timer.h b/code/ecp/timer.h
index 8863226..8863226 100644
--- a/code/core/timer.h
+++ b/code/ecp/timer.h
diff --git a/code/core/vconn/Makefile b/code/ecp/vconn/Makefile
index 613601c..613601c 100644
--- a/code/core/vconn/Makefile
+++ b/code/ecp/vconn/Makefile
diff --git a/code/core/vconn/vconn.c b/code/ecp/vconn/vconn.c
index dadff0f..dadff0f 100644
--- a/code/core/vconn/vconn.c
+++ b/code/ecp/vconn/vconn.c
diff --git a/code/core/vconn/vconn.h b/code/ecp/vconn/vconn.h
index 07832c7..07832c7 100644
--- a/code/core/vconn/vconn.h
+++ b/code/ecp/vconn/vconn.h
diff --git a/code/test/Makefile b/code/test/Makefile
index 26b89f6..4172420 100644
--- a/code/test/Makefile
+++ b/code/test/Makefile
@@ -1,8 +1,8 @@
 include ../Makefile.platform
-CFLAGS=$(CFLAGS_PL) -I../core -I../util -Wno-int-to-void-pointer-cast
+CFLAGS=$(CFLAGS_PL) -I../ecp -I../util -Wno-int-to-void-pointer-cast
 LDFLAGS=$(LDFLAGS_PL)
 
-dep=../core/libecpcore.a ../core/crypto/libecpcr.a ../core/htable/libecpht.a ../core/posix/libecptr.a ../core/posix/libecptm.a ../core/vconn/libecpvconn.a ../util/libecputil.a
+dep=../ecp/libecpcore.a ../ecp/crypto/libecpcr.a ../ecp/htable/libecpht.a ../ecp/posix/libecptr.a ../ecp/posix/libecptm.a ../ecp/vconn/libecpvconn.a ../util/libecputil.a
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
diff --git a/code/test/vid/Makefile b/code/test/vid/Makefile
index 04d5b5c..0abb572 100644
--- a/code/test/vid/Makefile
+++ b/code/test/vid/Makefile
@@ -2,7 +2,7 @@
 LIBVPX_HOME=/Users/majstor/src/libvpx
 CFLAGS=-D_V4L2_KERNEL_ -I/usr/src/linux-headers-$(uname -r) -I$(LIBVPX_HOME) -I/opt/local/include/SDL2 -I../../core -I../../vconn -I../../util
 LDFLAGS=-L$(LIBVPX_HOME) -L/opt/local/lib
-dep=../../core/libecpcore.a ../../core/crypto/libecpcr.a ../../core/htable/libecpht.a ../../core/posix/libecptr.a ../../core/posix/libecptm.a ../../vconn/libecpvconn.a ../../util/libecputil.a ../init.o
+dep=../../ecp/libecpcore.a ../../ecp/crypto/libecpcr.a ../../ecp/htable/libecpht.a ../../ecp/posix/libecptr.a ../../ecp/posix/libecptm.a ../../vconn/libecpvconn.a ../../util/libecputil.a ../init.o
 
 all: client cap
 
diff --git a/code/util/Makefile b/code/util/Makefile
index caa8226..0645ace 100644
--- a/code/util/Makefile
+++ b/code/util/Makefile
@@ -1,9 +1,9 @@
 include ../Makefile.platform
-CFLAGS=$(CFLAGS_PL) -I../core
+CFLAGS=$(CFLAGS_PL) -I../ecp
 LDFLAGS=$(LDFLAGS_PL)
 
 obj=util.o
-dep=../core/libecpcore.a ../core/crypto/libecpcr.a ../core/htable/libecpht.a ../core/posix/libecptr.a ../core/posix/libecptm.a ./libecputil.a 
+dep=../ecp/libecpcore.a ../ecp/crypto/libecpcr.a ../ecp/htable/libecpht.a ../ecp/posix/libecptr.a ../ecp/posix/libecptm.a ./libecputil.a 
 
 
 %.o: %.c %.h