sys/tree.h is not needed
Move definitions to correct places