Improved <sys/typed.h> / <unistd.h> handling as suggested by the