--- festival/src/modules/MultiSyn/EST_JoinCostCache.h.orig	2004-05-27 15:53:09.000000000 +0200
+++ festival/src/modules/MultiSyn/EST_JoinCostCache.h	2005-12-20 10:22:12.000000000 +0100
@@ -56,11 +56,11 @@
 /** Object oriented approach for better and for worse... 
 */
 
+#include <ostream.h>
 #include "EST_TList.h"
 #include "ling_class/EST_Item.h"
 
 class EST_JoinCost;
-class ostream;
 
 class EST_JoinCostCache {
 public:
--- festival/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc.orig	2005-12-20 10:27:39.000000000 +0100
+++ festival/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc	2005-12-20 10:48:04.000000000 +0100
@@ -39,7 +39,7 @@
 /*  Instantiate TStringHash for ItemList*                                */
 /*************************************************************************/
 
-#include "EST_THash.h"
+#include <EST/EST_THash.h>
 #include "EST_String.h"
 #include "EST_Val.h"
 #include "DiphoneUnitVoice.h" //for ItemList
--- festival/src/modules/UniSyn_diphone/us_diphone.h.orig	2005-12-20 10:29:03.000000000 +0100
+++ festival/src/modules/UniSyn_diphone/us_diphone.h	2005-12-20 10:48:01.000000000 +0100
@@ -43,7 +43,7 @@
 
 #include "EST_FileType.h"
 #include "EST_TVector.h"
-#include "EST_THash.h"
+#include <EST/EST_THash.h>
 #include "EST_Token.h"
 #include "ling_class/EST_Relation.h"
 
--- festival/src/modules/MultiSyn/DiphoneUnitVoice.cc.orig	2005-12-20 10:36:04.000000000 +0100
+++ festival/src/modules/MultiSyn/DiphoneUnitVoice.cc	2005-12-20 10:50:20.000000000 +0100
@@ -47,7 +47,7 @@
 #include "EST_Track.h"
 #include "EST_track_aux.h"
 #include "EST_Wave.h"
-#include "EST_THash.h"
+#include <EST/EST_THash.h>
 #include "EST_TList.h"
 #include "EST_types.h"
 #include "ling_class/EST_Utterance.h"
--- festival/src/modules/MultiSyn/DiphoneVoiceModule.cc.orig	2005-12-20 10:39:27.000000000 +0100
+++ festival/src/modules/MultiSyn/DiphoneVoiceModule.cc	2005-12-20 10:51:21.000000000 +0100
@@ -47,7 +47,7 @@
 #include "EST_Track.h"
 #include "EST_track_aux.h"
 #include "EST_Wave.h"
-#include "EST_THash.h"
+#include <EST/EST_THash.h>
 #include "EST_TList.h"
 #include "EST_types.h"
 #include "ling_class/EST_Utterance.h"