Removed upstreamed patches. Also fixes a redefinition error on some platforms. Cleaned up the DEPENDS to be simpler and more concise. Signed-off-by: Rosen Penev <rosenp@gmail.com>