more resolving of defines for launchd
fix duplicate declaration
incremental compile fixes