Fix build

On a current debian unstable (gcc 4.8.2) I was having a bit of namespace
trouble when building. This fixes the build.

Please code-review thoroughly, I am new here.