diff --git a/Generators/Tauolapp_i/src/TauolaPP.cxx b/Generators/Tauolapp_i/src/TauolaPP.cxx
index 02c25bf2f516de7e59e3daa8f79d217b17d558aa..535e731b248f450008f7ed24a4f6ce14061bcd42 100644
--- a/Generators/Tauolapp_i/src/TauolaPP.cxx
+++ b/Generators/Tauolapp_i/src/TauolaPP.cxx
@@ -7,7 +7,16 @@
 // Tauola header files
 #include "Tauola/Log.h"
 #include "Tauola/Tauola.h"
+#ifdef HEPMC3
+#include "Tauola/TauolaHepMC3Event.h"
+namespace Tauolapp
+{
+using TauolaHepMCEvent=TauolaHepMC3Event;
+using TauolaHepMCParticle=TauolaHepMC3Particle;
+}
+#else
 #include "Tauola/TauolaHepMCEvent.h"
+#endif
 
 #include "Tauola/f_Variables.h"