Fix multiple inclusion of amalgamation header
Revert "Fix multiple inclusion of amalgamation header"

This reverts commit d257065bf496a006e3bb5899f35bef445ab284ea.
Comment out includes instead of skipping them
Avoid inclusion of main header multiple times in a row