modify to use CL-REEXPORT's :INCLUDE option