diff --git a/compiler/files.pas b/compiler/files.pas
index be0c0919fb..e7077f1cb1 100644
--- a/compiler/files.pas
+++ b/compiler/files.pas
@@ -320,7 +320,8 @@ unit files;
       begin
         if is_macro then
          begin
-           Freemem(buf,maxbufsize);
+           if assigned(buf) then
+             Freemem(buf,maxbufsize);
            buf:=nil;
            {is_macro:=false;
            still needed for dispose in scanner PM }
@@ -1021,7 +1022,11 @@ unit files;
 end.
 {
   $Log$
-  Revision 1.64  1998-10-14 13:38:19  peter
+  Revision 1.65  1998-10-15 12:22:25  pierre
+    * close include files immediately after end reading
+      instead of waiting until unit compilation ended !
+
+  Revision 1.64  1998/10/14 13:38:19  peter
     * fixed path with staticlib/objects in ppufiles
 
   Revision 1.63  1998/10/14 11:02:49  daniel
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index 97c817d373..b4a04e4cb9 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -319,6 +319,8 @@ implementation
              to_dispose:=inputfile
            else
              to_dispose:=nil;
+           { we can allways close the file, no ? }
+           inputfile^.close;
            inputfile:=inputfile^.next;
            if assigned(to_dispose) then
              dispose(to_dispose,done);
@@ -1449,7 +1451,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.61  1998-10-09 11:08:15  peter
+  Revision 1.62  1998-10-15 12:22:23  pierre
+    * close include files immediately after end reading
+      instead of waiting until unit compilation ended !
+
+  Revision 1.61  1998/10/09 11:08:15  peter
     * fixed inputfile^.name^ bug
 
   Revision 1.60  1998/10/09 08:56:31  pierre