More includes fixups
Let's turn constant-conversions back to warnings for now
changed daemon to srdaemon because of conflict