anchor.diff:  	{ok,NewF,Pname} ->
   	    wait_req_scan(enter_file2(NewF, Pname, From, St, Loc));
   	{error,_E1} ->
  -	    case catch find_lib_dir(NewName) of
  -		{LibDir, Rest} when is_list(LibDir) ->
  -		    LibName = fname_join([LibDir | Rest]),
  -		    case file:open(LibName, [read]) of
  +	    case expand_lib_dir(NewName) of
  +		{ok,Header} ->
  +		    case file:open(Header, [read]) of
   			{ok,NewF} ->
  -			    wait_req_scan(enter_file2(NewF, LibName, From,
  +			    wait_req_scan(enter_file2(NewF, Header, From,
                                                         St, Loc));
   			{error,_E2} ->
   			    epp_reply(From,
  
positive.code: %%  normal search path, if not we assume that the first directory name
  %%  is a library name, find its true directory and try with that.
  
  find_lib_dir(NewName) ->
      [Lib | Rest] = filename:split(NewName),
      {code:lib_dir(list_to_atom(Lib)), Rest}.
  
  scan_include_lib([{'(',_Llp},{string,_Lf,_NewName0},{')',_Lrp},{dot,_Ld}],
                   Inc, From, St)
  
negative.code:                                               {include,lib,NewName}}}),
  			    wait_req_scan(St)
  		    end;
  		error ->
  		    epp_reply(From, {error,{loc(Inc),epp,
                                              {include,lib,NewName}}}),
  		    wait_req_scan(St)
  