Fixed warnings. Don’t want to declare things as static in header files - potentially you end up with a copy in every file that includes the header (directly or indirectly).