minor cleanup + safety checks
Wrote "# include" as "#include" to keep some (old) preprocessors happy.
Clean-up.
Initial revision