Fix compile time errors due to not-included headers