diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md
index 61c80c9c5b822..4a91fce71c581 100644
--- a/README/ReleaseNotes/v642/index.md
+++ b/README/ReleaseNotes/v642/index.md
@@ -83,6 +83,7 @@ The `TMVA_SOFIE_GNN` tutorials have been migrated to this workflow and produce i
 * The header `Riostream.h` is deprecated and will be removed after ROOT 6.44, use `<iostream>` or `<fstream>` or `<iomanip>` instead.
 * The header `Rstrstream.h` is deprecated and will be removed after ROOT 6.44, use instead `<sstream>`.
 * The headers `ZipLZMA.h`, `ZipLZ4.h` and `ZipZSTD.h` are deprecated and will be removed in ROOT 6.46, use instead the public methods in the `RZip.h` interface.
+* The headers `Hepevt.h` and `cfortran.h` are deprecated and will no longer be part of ROOT public installed headers in ROOT 6.44, use instead the `TGenerator.h` public interface or the `cfortran.h` header of the `cfitsio` library, respectively.
 
 ## Build System
 
diff --git a/montecarlo/eg/inc/Hepevt.h b/montecarlo/eg/inc/Hepevt.h
index ca530ceb997d8..984534e1326e0 100644
--- a/montecarlo/eg/inc/Hepevt.h
+++ b/montecarlo/eg/inc/Hepevt.h
@@ -13,6 +13,10 @@
 
 #include "Rtypes.h"
 
+#if !defined(ROOT_TGenerator_cxx) && !defined(G__DICTIONARY)
+#warning "This header is an implementation detail, is deprecated and will be removed in ROOT 6.44. Use instead the `TGenerator.h` public interface"
+#endif
+
 #include "cfortran.h"
 
 extern "C" {
diff --git a/montecarlo/eg/inc/cfortran.h b/montecarlo/eg/inc/cfortran.h
index 1416f39a5fabc..eaa640a428e19 100644
--- a/montecarlo/eg/inc/cfortran.h
+++ b/montecarlo/eg/inc/cfortran.h
@@ -5,6 +5,10 @@
 #ifndef __CFORTRAN_LOADED
 #define __CFORTRAN_LOADED
 
+#if !defined(ROOT_TGenerator_cxx) && !defined(G__DICTIONARY)
+#warning "This header is an implementation detail, is deprecated and will be removed in ROOT 6.44. Use instead the `cfortran.h` header from `cfitsio` library"
+#endif
+
 /*
    THIS FILE IS PROPERTY OF BURKHARD BUROW. IF YOU ARE USING THIS FILE YOU
    SHOULD ALSO HAVE ACCESS TO CFORTRAN.DOC WHICH PROVIDES TERMS FOR USING,
diff --git a/montecarlo/eg/src/TGenerator.cxx b/montecarlo/eg/src/TGenerator.cxx
index 0d8c41702e26e..b07ca453aa6a1 100644
--- a/montecarlo/eg/src/TGenerator.cxx
+++ b/montecarlo/eg/src/TGenerator.cxx
@@ -142,6 +142,7 @@ This is especially useful for example with TVirtualMC or similar.
 #include "TParticlePDG.h"
 #include "TParticle.h"
 #include "TObjArray.h"
+#define ROOT_TGenerator_cxx
 #include "Hepevt.h"
 #include "TVirtualPad.h"
 #include "TView.h"