Patch includes config.h and fixes issue #22