diff --git a/compiler/pass_1.pas b/compiler/pass_1.pas
index 9e92d67195..b48dd797f9 100644
--- a/compiler/pass_1.pas
+++ b/compiler/pass_1.pas
@@ -43,7 +43,12 @@ implementation
       tcadd,tccal,tccnv,tccon,tcflw,
       tcinl,tcld,tcmat,tcmem,tcset
 {$ifdef i386}
-      ,i386,tgeni386
+{$ifdef Ag386Bin}
+      ,i386base,i386asm
+{$else}
+      ,i386
+{$endif}
+      ,tgeni386
 {$endif}
 {$ifdef m68k}
       ,m68k,tgen68k
@@ -367,7 +372,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.99  1998-12-11 00:03:27  peter
+  Revision 1.100  1999-02-22 02:44:07  peter
+    * ag386bin doesn't use i386.pas anymore
+
+  Revision 1.99  1998/12/11 00:03:27  peter
     + globtype,tokens,version unit splitted from globals
 
   Revision 1.98  1998/11/23 17:49:03  pierre
diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas
index 1403ab5fd9..1661f014bb 100644
--- a/compiler/pdecl.pas
+++ b/compiler/pdecl.pas
@@ -64,8 +64,12 @@ unit pdecl;
        ,pbase,ptconst,pexpr,psub,pexports
        { processor specific stuff }
 {$ifdef i386}
+{$ifdef Ag386Bin}
+       ,i386base
+{$else}
        ,i386
 {$endif}
+{$endif}
 {$ifdef m68k}
        ,m68k
 {$endif}
@@ -2149,7 +2153,10 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.96  1999-02-17 14:20:40  pierre
+  Revision 1.97  1999-02-22 02:44:10  peter
+    * ag386bin doesn't use i386.pas anymore
+
+  Revision 1.96  1999/02/17 14:20:40  pierre
    * Reference specific bug in recompiling unit solved
 
   Revision 1.95  1999/01/25 20:13:48  peter
diff --git a/compiler/pexports.pas b/compiler/pexports.pas
index bf3de69805..841d13f373 100644
--- a/compiler/pexports.pas
+++ b/compiler/pexports.pas
@@ -66,7 +66,6 @@ unit pexports;
                         if ((srsym^.typ<>procsym) or
                           ((pprocdef(pprocsym(srsym)^.definition)^.options and poexports)=0)) and
                           (srsym^.typ<>varsym) and (srsym^.typ<>typedconstsym) then
-{* Changes made by Ozerski 23.10.1998}
                           Message(parser_e_illegal_symbol_exported)
                         else
                          begin
@@ -75,39 +74,30 @@ unit pexports;
                           delete(InternalProcName,1,1);
                           DefString:=ProcName+'='+InternalProcName;
                          end;
-{* End changes}
                         if (idtoken=_INDEX) then
                           begin
                              consume(_INDEX);
                              hp^.options:=hp^.options or eo_index;
                              val(pattern,hp^.index,code);
                              consume(INTCONST);
-{* Changes made by Ozerski 23.10.1998}
                              DefString:=ProcName+'='+InternalProcName;{Index ignored!}
-{* End changes}
                           end;
                         if (idtoken=_NAME) then
                           begin
                              consume(_NAME);
                              hp^.name:=stringdup(pattern);
                              hp^.options:=hp^.options or eo_name;
-{* Changes made by Ozerski 23.10.1998}
                              consume(CSTRING); {Bug fixed?}
                              DefString:=hp^.name^+'='+InternalProcName;
-{* End changes}
                           end;
                         if (idtoken=_RESIDENT) then
                           begin
                              consume(_RESIDENT);
                              hp^.options:=hp^.options or eo_resident;
-{* Changes made by Ozerski 23.10.1998}
                              DefString:=ProcName+'='+InternalProcName;{Resident ignored!}
-{* End changes}
                           end;
-{* Changes made by Ozerski 23.10.1998}
                         if DefString<>''then
                          DefFile.AddExport(DefString);
-{* End changes}
                         if srsym^.typ=procsym then
                           exportlib^.exportprocedure(hp)
                         else
@@ -122,20 +112,21 @@ unit pexports;
                 break;
            end;
          consume(SEMICOLON);
-{* Changes made by Ozerski 23.10.1998}
         if not DefFile.exportlist.empty then
          begin
-          deffile.fname:='DEF.$$$';
-          deffile.writefile;
+           deffile.fname:='DEF.$$$';
+           deffile.writefile;
          end;
-{* End changes}
       end;
 
 end.
 
 {
   $Log$
-  Revision 1.6  1998-12-11 00:03:31  peter
+  Revision 1.7  1999-02-22 02:44:12  peter
+    * ag386bin doesn't use i386.pas anymore
+
+  Revision 1.6  1998/12/11 00:03:31  peter
     + globtype,tokens,version unit splitted from globals
 
   Revision 1.5  1998/11/30 13:26:25  pierre
diff --git a/compiler/ptconst.pas b/compiler/ptconst.pas
index 9d65165a17..ec646371cd 100644
--- a/compiler/ptconst.pas
+++ b/compiler/ptconst.pas
@@ -41,8 +41,12 @@ unit ptconst;
        ,pbase,pexpr
        { processor specific stuff }
 {$ifdef i386}
+{$ifdef Ag386Bin}
+       ,i386base
+{$else}
        ,i386
 {$endif}
+{$endif}
 {$ifdef m68k}
        ,m68k
 {$endif}
@@ -702,7 +706,10 @@ unit ptconst;
 end.
 {
   $Log$
-  Revision 1.36  1999-02-17 10:15:26  peter
+  Revision 1.37  1999-02-22 02:44:13  peter
+    * ag386bin doesn't use i386.pas anymore
+
+  Revision 1.36  1999/02/17 10:15:26  peter
     * fixed error messages when parsing typed const array
 
   Revision 1.35  1999/01/20 14:09:28  pierre
diff --git a/compiler/win_targ.pas b/compiler/win_targ.pas
index 82dff048cf..1de573b1ad 100644
--- a/compiler/win_targ.pas
+++ b/compiler/win_targ.pas
@@ -58,7 +58,11 @@ unit win_targ;
        ,gdb
 {$endif}
 {$ifdef i386}
+{$ifdef Ag386Bin}
+       ,i386base,i386asm
+{$else}
        ,i386
+{$endif}
 {$endif}
        ;
 
@@ -696,7 +700,10 @@ unit win_targ;
 end.
 {
   $Log$
-  Revision 1.19  1998-12-11 00:04:06  peter
+  Revision 1.20  1999-02-22 02:44:14  peter
+    * ag386bin doesn't use i386.pas anymore
+
+  Revision 1.19  1998/12/11 00:04:06  peter
     + globtype,tokens,version unit splitted from globals
 
   Revision 1.18  1998/12/02 10:26:13  pierre