Applied changes.
Roll all header files back