modified patch to include includes on Ubuntu