better static lib support
renamed function to avoid a conflict on iOS
switched headers
got the last of the defines fixed up
we need these types