revert removed headers to see if that makes loading under 32bit systems work again.