removed extern from struct defs
Merge branch 'dev'