Requires BUILD_PATENTED.
Added patch to fix compilation with it.
Removed include file hack. It's incorrect and it's also npupnp that
needs fixing.
Refreshed npupnp patch to the newest version sent upstream.
Signed-off-by: Rosen Penev <rosenp@gmail.com>