Moved header definitions to inl files