* Added some 'requires' so that it works from the command line
* Changed UNIQUE_HEADERS to NON_UNIQUE_HEADERS