Fixing inconsistency in forward declaration