Added missing includes for building on Unix
Fixed a macro error where true would be used as a function