Fixed problems with compilation without AHMED.
Added two licence comments.