Reverted makefile changes
added functions and headers missing from merge
added functions missing from merge