Replacing more c++ reserved keywords
Add const to make the declaration match the definition

Conflicts:
	src/app-utils/Makefile.am
Be sure to end G_BEGIN_DECLS with G_END_DECLS