Fixed .h declarations