Made a constructor be explicit.
Fixed miscellaneous include problems.