SW-34. Removing header from C files. Fixing SConscript.
SW-34. Indentation.