Fixed/added boilerplating and autogen of include guards