header guards added, files now use defines.h