Revert "Revert "Fixed Header + Virtual Function Errors""

This reverts commit 1abb369ab464fa9580a634eccfe72b2523b619ec.