Corrctions to templates. Allows correct compilation _except_ for include ordering.