Commented out requiring magit as installed from elpa, and set
ac-source-c-headers to work for C and C++ mode.