Removed .cpp including