Fix variables used as parameters and skip files using @import (#957)

Fix variables used as parameters and skip files using @import (#957) #1342