add extern decorations in .h ; short -> int