added glib header guards so that library can be linked in c++
made some changes to Makefile to reflect recent changes