2004/03/17 12:18:10 waratah 1.22.90.1: #i1858# alter the order of some definitions to fix some -Wall warnings