include directory improvements, building with latest Psybrus (trimmed down includes)
updated to work with latest psybrus