Fixed Makefile to reset INCLUDE because Intel populates it by default.
Refactored to prepare for database parameters.