--- festival/src/modules/clunits/clunits.h	2006/06/05 01:58:30	1.1
+++ festival/src/modules/clunits/clunits.h	2006/06/05 01:58:47
@@ -83,9 +83,9 @@ class CLDB {
     CLfile *get_fileitem(const EST_String &name)
 	{ return (CLfile *)fileindex.lookup(name); }
     void load_coefs_sig(EST_Item *unit);
-    CLfile *CLDB::get_file_coefs_sig(const EST_String &fileid);
+    CLfile *get_file_coefs_sig(const EST_String &fileid);
     void load_join_coefs(CLunit *unit);
-    CLfile *CLDB::get_file_join_coefs(const EST_String &fileid);
+    CLfile *get_file_join_coefs(const EST_String &fileid);
 };
 
 
--- festival/src/modules/MultiSyn/EST_JoinCostCache.h	2006/06/05 02:00:28	1.1
+++ festival/src/modules/MultiSyn/EST_JoinCostCache.h	2006/06/05 02:00:57
@@ -56,11 +56,11 @@
 /** Object oriented approach for better and for worse... 
 */
 
+#include <ostream>
 #include "EST_TList.h"
 #include "ling_class/EST_Item.h"
 
 class EST_JoinCost;
-class ostream;
 
 class EST_JoinCostCache {
 public: