Added missing headers that should be installed.
Code analysis annotations found a legitimate bug!