More daemon stuff.
Use C++ includes when appropriate.