Include/header cleanup + refactoring