diff --git a/compiler/impdef.pas b/compiler/impdef.pas
index 4395395c75..8cde084bf1 100644
--- a/compiler/impdef.pas
+++ b/compiler/impdef.pas
@@ -23,7 +23,7 @@
 
  ****************************************************************************
 }
-unit imtdef;
+unit impdef;
 
 {$ifndef STANDALONE}
   {$i fpcdefs.inc}
@@ -71,7 +71,7 @@ var
   PEoffset:cardinal;
   loaded:longint;
 
-function DOSstubOK(var x:longint):longbool;
+function DOSstubOK(var x:cardinal):longbool;
 begin
   blockread(f,TheWord,2,loaded);
   if loaded<>2 then
@@ -175,7 +175,7 @@ procedure CreateTempDir(const s:string);
  end;
 procedure call_as(const name:string);
  begin
-  exec(utilsprefix+as_name,'-o '+name+'o '+name);
+  exec(as_name,'-o '+name+'o '+name);
  end;
 procedure call_ar;
  var
@@ -190,7 +190,7 @@ procedure call_ar;
   GetFAttr(f,attr);
   If DOSError=0 then
    erase(f);
-  exec(utilsprefix+ar_name,'rs '+impname+' '+path+dirsep+'*.swo');
+  exec(ar_name,'rs '+impname+' '+path+dirsep+'*.swo');
   cleardir(path,'*.sw');
   cleardir(path,'*.swo');
   {$i-}
@@ -478,7 +478,10 @@ end.
 
 {
   $Log$
-  Revision 1.12  2003-10-03 14:16:48  marco
+  Revision 1.13  2004-02-22 14:52:59  hajny
+    * compilation fixes + *w tools renamed to *
+
+  Revision 1.12  2003/10/03 14:16:48  marco
    * -XP<prefix> support
 
   Revision 1.11  2003/10/02 21:17:08  peter
diff --git a/compiler/utils/fpimpdef.pp b/compiler/utils/fpimpdef.pp
index 2dd346d2b9..0c9663cc50 100644
--- a/compiler/utils/fpimpdef.pp
+++ b/compiler/utils/fpimpdef.pp
@@ -75,21 +75,21 @@ begin
 binname:=GetOption('-i','--input');
 if(binname='')or(Ofound('-h','--help')>0)then
   help_info;
- asw_name:=GetOption('-s','--assembler');
- if asw_name='' then
-  asw_name:='asw';
- arw_name:=GetOption('-r','--archiver');
- if arw_name='' then
-  arw_name:='arw';
+ as_name:=GetOption('-s','--assembler');
+ if as_name='' then
+  as_name:='as';
+ ar_name:=GetOption('-r','--archiver');
+ if ar_name='' then
+  ar_name:='ar';
 {$ifndef UNIX}
- AddExt(asw_name);
- AddExt(arw_name);
+ AddExt(as_name);
+ AddExt(ar_name);
 {$endif}
  EnvPath:=GetEnv('Path');
  if EnvPath='' then
   EnvPath:=GetEnv('PATH');
- asw_name:=FSearch(asw_name,EnvPath);
- arw_name:=FSearch(arw_name,EnvPath);
+ as_name:=FSearch(as_name,EnvPath);
+ ar_name:=FSearch(ar_name,EnvPath);
 if not makedef(binname,GetOption('-o','--output'),GetOption('-l','--library'))then
   begin
    writeln('Export names not found');
diff --git a/compiler/utils/gppc386.pp b/compiler/utils/gppc386.pp
index 21fc3c053a..48fc69aef7 100644
--- a/compiler/utils/gppc386.pp
+++ b/compiler/utils/gppc386.pp
@@ -46,11 +46,7 @@ const
   GDBIniName = '.gdbinit';
   DefaultCompilerName = 'ppc386';
 {$else}
-{$ifdef win32}
-  GDBExeName = 'gdbpasw.exe';
-{$else not win32}
   GDBExeName = 'gdbpas.exe';
-{$endif win32}
   GDBIniName = 'gdb.ini';
   DefaultCompilerName = 'ppc386.exe';
 {$endif not linux}
@@ -143,7 +139,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.5  2002-12-06 17:51:11  peter
+  Revision 1.6  2004-02-22 14:52:59  hajny
+    * compilation fixes + *w tools renamed to *
+
+  Revision 1.5  2002/12/06 17:51:11  peter
     * merged cdecl and array fixes
 
   Revision 1.4  2002/06/02 09:44:17  marco