Moved NDEBUG definition to makefile from data_structures.h
Rearranged header to avoid double inclusions