Added missing m4 file.
Fixed order of includes.