Put the defines in the logical section and fix indentation.