Removed unwanted includes and shifted non shogun include to .cpp files.

Header includes glpk and cplex shifted back to .h

squash of 2 commits.