The code on both the new header files is essentially the same. This commit just adjusted #include in dependent modules. The new headers did not make to pch.h. This change is in preparation for some improvements in code that is now in time_support.h
