Commit e561bfe45e68a807eb39e062fa63c3e18687aaf2

Con Kolivas 2012-10-18T00:57:23

Revert "Rename INCLUDES in Makefile.am." This reverts commit e341e346d38b465139abb8da4c8d3a02f9abe3c8. Breaks build.