Added makefiles; fixed headers; added raw config guard; added new headers