Merge pull request #2 from massar/master

A few more warning fixes (prototype defines) + makes everything static