Revert -Wno-error=cpp and -Werror temporarily

PR for issue #712

I really hope we can have a better solution as I would very much like to keep -Werror