Small changes to make program run with gcc and change to remove the need to have atomic.h in ../include