Make things static that should be. Declare stuff in headers that should be.