Applied logging requirements to the userspace app.
Also organized the includes again.