o Cleanup of includes: user.h may be a catch-all, but that's not   entirely desirable.  Back out previous commit, and clean up includes   to be more minimal.
o Cleanup of includes: user.h may be a catch-all, but that's not
  entirely desirable.  Back out previous commit, and clean up includes
  to be more minimal.

Submitted by:	bde

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase