garazdawi · garazdawi · Feb 10, 2026 · Feb 10, 2026 · Feb 10, 2026 · Feb 10, 2026
diff --git a/bootstrap/lib/kernel/ebin/auth.beam b/bootstrap/lib/kernel/ebin/auth.beam
diff --git a/bootstrap/lib/kernel/ebin/code.beam b/bootstrap/lib/kernel/ebin/code.beam
diff --git a/bootstrap/lib/kernel/ebin/code_server.beam b/bootstrap/lib/kernel/ebin/code_server.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log.beam b/bootstrap/lib/kernel/ebin/disk_log.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log_1.beam b/bootstrap/lib/kernel/ebin/disk_log_1.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log_server.beam b/bootstrap/lib/kernel/ebin/disk_log_server.beam
diff --git a/bootstrap/lib/kernel/ebin/file.beam b/bootstrap/lib/kernel/ebin/file.beam
diff --git a/bootstrap/lib/kernel/ebin/file_io_server.beam b/bootstrap/lib/kernel/ebin/file_io_server.beam
diff --git a/bootstrap/lib/kernel/ebin/gen_tcp.beam b/bootstrap/lib/kernel/ebin/gen_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_db.beam b/bootstrap/lib/kernel/ebin/inet_db.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_parse.beam b/bootstrap/lib/kernel/ebin/inet_parse.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_std_h.beam b/bootstrap/lib/kernel/ebin/logger_std_h.beam
diff --git a/bootstrap/lib/kernel/ebin/os.beam b/bootstrap/lib/kernel/ebin/os.beam
diff --git a/bootstrap/lib/kernel/ebin/ram_file.beam b/bootstrap/lib/kernel/ebin/ram_file.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_compressed.beam b/bootstrap/lib/kernel/ebin/raw_file_io_compressed.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_deflate.beam b/bootstrap/lib/kernel/ebin/raw_file_io_deflate.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_delayed.beam b/bootstrap/lib/kernel/ebin/raw_file_io_delayed.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_inflate.beam b/bootstrap/lib/kernel/ebin/raw_file_io_inflate.beam
diff --git a/bootstrap/lib/kernel/ebin/raw_file_io_list.beam b/bootstrap/lib/kernel/ebin/raw_file_io_list.beam
diff --git a/bootstrap/lib/kernel/ebin/socket.beam b/bootstrap/lib/kernel/ebin/socket.beam
diff --git a/bootstrap/lib/kernel/ebin/wrap_log_reader.beam b/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
diff --git a/bootstrap/lib/kernel/include/file.hrl b/bootstrap/lib/kernel/include/file.hrl
@@ -24,46 +24,8 @@
 -define(FILE_HRL_, 1).
 %%--------------------------------------------------------------------------
 
--record(file_info,
-        {size   :: non_neg_integer() | 'undefined',  % Size of file in bytes.
-         type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink'
-                 | 'undefined',
-         access :: 'read' | 'write' | 'read_write' | 'none' | 'undefined',
-         atime  :: file:date_time() | non_neg_integer() | 'undefined',
-                                     % The local time the file was last read:
-                                     % {{Year, Mon, Day}, {Hour, Min, Sec}}.
-                                     % atime, ctime, mtime may also be unix epochs()
-         mtime  :: file:date_time() | non_neg_integer() | 'undefined',
-                                     % The local time the file was last written.
-         ctime  :: file:date_time() | non_neg_integer() | 'undefined',
-                                     % The interpretation of this time field
-                                     % is dependent on operating system.
-                                     % On Unix it is the last time the file
-                                     % or the inode was changed.  On Windows,
-                                     % it is the creation time.
-         mode   :: non_neg_integer() | 'undefined',
-                                     % File permissions.  On Windows,
-                                     % the owner permissions will be
-                                     % duplicated for group and user.
-         links  :: non_neg_integer() | 'undefined',
-                                     % Number of links to the file (1 if the
-                                     % filesystem doesn't support links).
-         major_device :: non_neg_integer() | 'undefined',
-                                     % Identifies the file system (Unix),
-                                     % or the drive number (A: = 0, B: = 1)
-                                     % (Windows).
-         %% The following are Unix specific.
-         %% They are set to zero on other operating systems.
-         minor_device :: non_neg_integer() | 'undefined',
-                                             % Only valid for devices.
-         inode   :: non_neg_integer() | 'undefined',  % Inode number for file.
-         uid     :: non_neg_integer() | 'undefined',   % User id for owner.
-         gid     :: non_neg_integer() | 'undefined'}). % Group id for owner.
+-import_record(file, [file_info, file_descriptor]).
 
 
--record(file_descriptor,
-	{module :: module(),     % Module that handles this kind of file
-	 data   :: term()}).     % Module dependent data
-
 %%--------------------------------------------------------------------------
 -endif.
diff --git a/bootstrap/lib/stdlib/ebin/epp.beam b/bootstrap/lib/stdlib/ebin/epp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_compile.beam b/bootstrap/lib/stdlib/ebin/erl_compile.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_tar.beam b/bootstrap/lib/stdlib/ebin/erl_tar.beam
diff --git a/bootstrap/lib/stdlib/ebin/file_sorter.beam b/bootstrap/lib/stdlib/ebin/file_sorter.beam
diff --git a/bootstrap/lib/stdlib/ebin/filelib.beam b/bootstrap/lib/stdlib/ebin/filelib.beam
diff --git a/bootstrap/lib/stdlib/ebin/filename.beam b/bootstrap/lib/stdlib/ebin/filename.beam
diff --git a/bootstrap/lib/stdlib/ebin/shell.beam b/bootstrap/lib/stdlib/ebin/shell.beam
diff --git a/bootstrap/lib/stdlib/ebin/zip.beam b/bootstrap/lib/stdlib/ebin/zip.beam
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
@@ -173,5 +173,8 @@ dialyzer: $(DIA_PLT)
                   ../ebin \
                   $(DIA_WARNINGS) \
                   --verbose
+
+ifneq ($(filter $(APP_TARGET),$(MAKECMDGOALS)),$(APP_TARGET))
 DEP_REL_TOP=../../../lib/
 include $(ERL_TOP)/make/dep.mk
+endif
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
@@ -96,7 +96,7 @@ The `erl_prim_loader` module interprets the following command-line flags:
 %% Used by init and the code server
 -export([get_modules/2, is_basename/1]).
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -type host() :: atom().
 
@@ -305,7 +305,7 @@ record [`file_info`](`t:file:file_info/0`), defined in the Kernel include file
 function is called:
 
 ```erlang
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 ```
 
 For more information about the record see `file:read_file_info/2`.

diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
@@ -267,7 +267,7 @@ error
 	 objfile_extension/0, archive_extension/0,code_path_choice/0,
          get_configfd/1, set_configfd/2]).
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -doc "Current status of init.".
 -type internal_status() :: 'starting' | 'started' | 'stopping'.

diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
@@ -674,12 +674,20 @@ read_handle_info_1(Fd, TimeType) ->
         #{ handle := FRef } = get_fd_data(Fd),
         case read_handle_info_nif(FRef) of
             {error, Reason} -> {error, Reason};
-            FileInfo -> {ok, adjust_times(FileInfo, TimeType)}
+            FileInfo ->
+                {ok, adjust_times(FileInfo, TimeType)}
         end
     catch
         error:_ -> {error, badarg}
     end.
 
+adjust_times({file_info, S, T, A, AT, MT, CT, M, L,
+              MAD, MID, I, U, G}, TimeType) ->
+    adjust_times(#file_info{size = S, type = T, access = A,
+                            atime = AT, mtime = MT, ctime = CT,
+                            mode = M, links = L,
+                            major_device = MAD, minor_device = MID, inode = I,
+                            uid = U, gid = G}, TimeType);
 adjust_times(FileInfo, posix) ->
     FileInfo;
 adjust_times(FileInfo, TimeType) ->

diff --git a/erts/preloaded/src/prim_zip.erl b/erts/preloaded/src/prim_zip.erl
@@ -37,7 +37,7 @@
 -export([splitter/3]).
 
 %% includes
--include_lib("kernel/include/file.hrl"). % #file_info
+-include("file.hrl"). % #file_info
 -include_lib("stdlib/include/zip.hrl").  % #zip_file, #zip_comment
 -include("zip_internal.hrl").            % #cd_file_header etc
 

diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
@@ -103,6 +103,7 @@ EXAMPLES = \
 
 ERL_COMPILE_FLAGS += \
 	-I$(ERL_TOP)/lib/stdlib \
+	-I../../kernel/include \
 	-Werror +nowarn_deprecated_catch
 
 ifeq ($(ERL_DETERMINISTIC),yes)

diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
@@ -72,7 +72,7 @@ ASN.1 data (encoded as `BER` or `PER`).
 
 -include("asn1_records.hrl").
 -include_lib("stdlib/include/erl_compile.hrl").
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -ifndef(vsn).
 -define(vsn,"0.0.1").

diff --git a/lib/common_test/src/ct_cover.erl b/lib/common_test/src/ct_cover.erl
@@ -31,7 +31,7 @@ This module exports help functions for performing code coverage analysis.
 
 -include("ct_util.hrl").
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -doc """
 Adds nodes to current cover test. Notice that this only works if cover support

diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
@@ -57,7 +57,7 @@
 -include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -define(suitelog_name,"suite.log").
 -define(run_summary, "suite.summary").

diff --git a/lib/common_test/src/ct_make.erl b/lib/common_test/src/ct_make.erl
@@ -34,7 +34,7 @@
 
 -export([all/0,all/1,files/1,files/2]).
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -define(MakeOpts,[noexec,load,netload,noload]).
 

diff --git a/lib/common_test/src/ct_release_test.erl b/lib/common_test/src/ct_release_test.erl
@@ -122,7 +122,7 @@
 
 -export([init/1, upgrade/4, cleanup/1, get_app_vsns/2, get_appup/2]).
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 %%-----------------------------------------------------------------
 -define(testnode, 'ct_release_test-upgrade').

diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
@@ -58,7 +58,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -include("test_server_internal.hrl").
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 
 init_target_info() ->

diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
@@ -84,7 +84,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -include("test_server_internal.hrl").
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 -define(suite_ext, "_SUITE").
 -define(log_ext, ".log.html").
 -define(src_listing_ext,  ".src.html").

diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
@@ -87,7 +87,7 @@ APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -Werror -I $(ERL_TOP)/lib -pa $(ERL_TOP)/lib/wx/ebin +nowarn_deprecated_catch
+ERL_COMPILE_FLAGS += -Werror -I $(ERL_TOP)/lib -I../../kernel/include -pa $(ERL_TOP)/lib/wx/ebin +nowarn_deprecated_catch
 
 
 # ----------------------------------------------------

diff --git a/lib/debugger/src/dbg_wx_interpret.erl b/lib/debugger/src/dbg_wx_interpret.erl
@@ -24,7 +24,7 @@
 -module(dbg_wx_interpret).
 -moduledoc false.
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 -include_lib("wx/include/wx.hrl").
 
 %% External exports

diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
@@ -24,7 +24,7 @@
 -module(dbg_wx_mon).
 -moduledoc false.
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 -include_lib("wx/include/wx.hrl").
 
 %% External exports

diff --git a/lib/debugger/src/dbg_wx_settings.erl b/lib/debugger/src/dbg_wx_settings.erl
@@ -24,7 +24,7 @@
 -module(dbg_wx_settings).
 -moduledoc false.
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 -include_lib("wx/include/wx.hrl").
 
 %% External exports

diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl
@@ -96,7 +96,7 @@ in the User's Guide for Debugger.
 %% External export only to be used by error_handler
 -export([eval/3]).
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 %%==Erlang Interpreter================================================
 %%

diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
@@ -96,6 +96,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # FLAGS
 # ----------------------------------------------------
 
+ERL_COMPILE_FLAGS += -I../../kernel/include
 ERL_COMPILE_FLAGS += -Werror
 ERL_COMPILE_FLAGS += +warn_export_vars +warn_unused_import +warn_missing_spec +warn_obsolete_bool_op
 

diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
@@ -38,7 +38,7 @@
          start_report_modules_changed_and_analyzed/1]).
 
 -include("dialyzer.hrl").
--include_lib("kernel/include/file.hrl").  % needed for #file_info{}
+-include("file.hrl").  % needed for #file_info{}
 
 -record(cl_state,
 	{backend_pid                      :: pid() | 'undefined',

diff --git a/lib/dialyzer/src/dialyzer_incremental.erl b/lib/dialyzer/src/dialyzer_incremental.erl
@@ -26,7 +26,7 @@
 -export([start/1, start_report_modules_analyzed/1, start_report_modules_changed_and_analyzed/1]).
 
 -include("dialyzer.hrl").
--include_lib("kernel/include/file.hrl").  % needed for #file_info{}
+-include("file.hrl").  % needed for #file_info{}
 
 -record(incremental_state,
     {backend_pid                      :: pid() | 'undefined',

diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
@@ -52,7 +52,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/eunit-$(VSN)
 EBIN = ../ebin
 INCLUDE=../include
 
-ERL_COMPILE_FLAGS += -pa $(EBIN) -pa ../../stdlib/ebin -I$(INCLUDE) \
+ERL_COMPILE_FLAGS += -pa $(EBIN) -pa ../../stdlib/ebin -I../../kernel/include -I$(INCLUDE) \
 	+warn_deprecated_catch +warn_obsolete_bool_op +warn_unused_import -Werror
 
 PARSE_TRANSFORM = eunit_autoexport.erl

diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl
@@ -37,7 +37,7 @@
 -include("eunit.hrl").
 -include("eunit_internal.hrl").
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -export([iter_init/3, iter_next/1, iter_prev/1, iter_id/1,
 	 enter_context/3, get_module_tests/2]).

diff --git a/lib/ftp/src/Makefile b/lib/ftp/src/Makefile
@@ -74,7 +74,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # FLAGS
 # ----------------------------------------------------
 EXTRA_ERLC_FLAGS = +warn_unused_vars +nowarn_deprecated_catch
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
+ERL_COMPILE_FLAGS += -I../../kernel/include -I$(ERL_TOP)/lib/kernel/src \
 	-pz $(EBIN) \
 	-pz $(ERL_TOP)/lib/public_key/ebin \
 	$(EXTRA_ERLC_FLAGS) -DVSN=\"$(VSN)\"

diff --git a/lib/ftp/src/ftp_progress.erl b/lib/ftp/src/ftp_progress.erl
@@ -36,7 +36,7 @@
 %% Spawn export
 -export([init/1]).
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -record(progress, {
 	  file                  :: string() | 'undefined',

diff --git a/lib/kernel/include/file.hrl b/lib/kernel/include/file.hrl
@@ -24,46 +24,8 @@
 -define(FILE_HRL_, 1).
 %%--------------------------------------------------------------------------
 
--record(file_info,
-        {size   :: non_neg_integer() | 'undefined',  % Size of file in bytes.
-         type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink'
-                 | 'undefined',
-         access :: 'read' | 'write' | 'read_write' | 'none' | 'undefined',
-         atime  :: file:date_time() | non_neg_integer() | 'undefined',
-                                     % The local time the file was last read:
-                                     % {{Year, Mon, Day}, {Hour, Min, Sec}}.
-                                     % atime, ctime, mtime may also be unix epochs()
-         mtime  :: file:date_time() | non_neg_integer() | 'undefined',
-                                     % The local time the file was last written.
-         ctime  :: file:date_time() | non_neg_integer() | 'undefined',
-                                     % The interpretation of this time field
-                                     % is dependent on operating system.
-                                     % On Unix it is the last time the file
-                                     % or the inode was changed.  On Windows,
-                                     % it is the creation time.
-         mode   :: non_neg_integer() | 'undefined',
-                                     % File permissions.  On Windows,
-                                     % the owner permissions will be
-                                     % duplicated for group and user.
-         links  :: non_neg_integer() | 'undefined',
-                                     % Number of links to the file (1 if the
-                                     % filesystem doesn't support links).
-         major_device :: non_neg_integer() | 'undefined',
-                                     % Identifies the file system (Unix),
-                                     % or the drive number (A: = 0, B: = 1)
-                                     % (Windows).
-         %% The following are Unix specific.
-         %% They are set to zero on other operating systems.
-         minor_device :: non_neg_integer() | 'undefined',
-                                             % Only valid for devices.
-         inode   :: non_neg_integer() | 'undefined',  % Inode number for file.
-         uid     :: non_neg_integer() | 'undefined',   % User id for owner.
-         gid     :: non_neg_integer() | 'undefined'}). % Group id for owner.
+-import_record(file, [file_info, file_descriptor]).
 
 
--record(file_descriptor,
-	{module :: module(),     % Module that handles this kind of file
-	 data   :: term()}).     % Module dependent data
-
 %%--------------------------------------------------------------------------
 -endif.
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
@@ -61,7 +61,7 @@ Manual.
 	 }).
 -type state() :: #state{}.
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 %%----------------------------------------------------------------------
 %% Exported functions

diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
@@ -416,7 +416,7 @@ common reasons.
 -export_type([load_error_rsn/0, load_ret/0]).
 -export_type([prepared_code/0]).
 -export_type([module_status/0]).
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 
 -export_type([coverage_mode/0]).
 -type coverage_mode() :: 'none' | 'function' | 'function_counters' |

diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
@@ -33,7 +33,7 @@
 	 error_msg/2, info_msg/2
 	]).
 
--include_lib("kernel/include/file.hrl").
+-include("file.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 
 -import(lists, [foreach/2]).