no more diet.h
Revert "no more diet.h"

This reverts commit 02d04698d16536597b8d3ce0b57aa57f7baafb6c.
no more diet.h
Merge branch 'master' into config
configure: fix nix32 setup & include setting.mk into tests/Makefile