Moved some things around; include guards in dinkvar.h replaced with #pragma once