Added class declarations in headers