diff --git a/configure b/configure
index 5303784e8b2f584d738c4ba32c24a3895ea54d69..7c4aae7874c960b69b83b891a3644105c6438eed 100755
--- a/configure
+++ b/configure
@@ -4016,7 +4016,7 @@ check_explicit "$enable_pythia6" "$enable_pythia6_explicit" \
 #
 if test ! "x$enable_pythia8" = "xno" ; then
     # Check for PYTHIA8 include and library
-    check_header "Pythia.h" "$pythia8incdir" \
+    check_header "Pythia8/Pythia.h" "$pythia8incdir" \
         $PYTHIA8 ${PYTHIA8:+$PYTHIA8/include} \
         /opt/pythia8/include /usr/local/include /usr/include /usr/include/pythia
     pythia8incdir=$found_dir
diff --git a/montecarlo/pythia8/inc/TPythia8.h b/montecarlo/pythia8/inc/TPythia8.h
index c36f187e80fc4289b4df644085562d0dc64b9b7a..0f70c2788df4a505894c6aef9ed676a8c6d8e442 100644
--- a/montecarlo/pythia8/inc/TPythia8.h
+++ b/montecarlo/pythia8/inc/TPythia8.h
@@ -66,7 +66,7 @@
 */
 
 #include "TGenerator.h"
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 
 
 class Pythia;
diff --git a/montecarlo/pythia8/inc/TPythia8Decayer.h b/montecarlo/pythia8/inc/TPythia8Decayer.h
index 0f17cbbf6ac1267b5383caf8dc395d623dc71d79..e80e74f7d6c2259e673f039a3c923963142d1811 100644
--- a/montecarlo/pythia8/inc/TPythia8Decayer.h
+++ b/montecarlo/pythia8/inc/TPythia8Decayer.h
@@ -7,7 +7,7 @@
 #ifndef TPYTHIA8DECAYER_H
 #define TPYTHIA8DECAYER_H
 
-#include <TVirtualMCDecayer.h>
+#include "TVirtualMCDecayer.h"
 
 class TClonesArrray;
 class TLorentzVector;
diff --git a/montecarlo/pythia8/src/TPythia8Decayer.cxx b/montecarlo/pythia8/src/TPythia8Decayer.cxx
index 68e15987596878214849b575995fce55c051bb3a..e7d916401b786e7383101d55a05ffad437f94927 100644
--- a/montecarlo/pythia8/src/TPythia8Decayer.cxx
+++ b/montecarlo/pythia8/src/TPythia8Decayer.cxx
@@ -16,8 +16,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-#include <TLorentzVector.h>
-#include <TPythia8.h>
+#include "TLorentzVector.h"
+#include "TPythia8.h"
 #include "TPythia8Decayer.h"
 
 ClassImp(TPythia8Decayer)