Issue #91 Reverse order of headers to fix build.