Get compiling with gcc4 - static/extern mismatch removed.