diff -Naur noteedit-2.8.1.orig/configure.in.in noteedit-2.8.1/configure.in.in
--- noteedit-2.8.1.orig/configure.in.in	2006-03-27 08:07:18.000000000 +0200
+++ noteedit-2.8.1/configure.in.in	2008-06-24 23:04:48.000000000 +0200
@@ -275,10 +275,10 @@
 
 	fi
 	cat >tse3vtest.cc << EOF
-#include <istream.h>
+#include <iostream>
 #include <tse3/TSE3.h>
 int main() {
-	cout << TSE3::TSE3_Version() << endl;
+	std::cout << TSE3::TSE3_Version() << std::endl;
 	return 0;
 }
 EOF
diff -Naur noteedit-2.8.1.orig/kguitar_excerpt/fingerlist.cpp noteedit-2.8.1/kguitar_excerpt/fingerlist.cpp
--- noteedit-2.8.1.orig/kguitar_excerpt/fingerlist.cpp	2006-03-26 22:54:31.000000000 +0200
+++ noteedit-2.8.1/kguitar_excerpt/fingerlist.cpp	2008-06-24 23:04:24.000000000 +0200
@@ -21,7 +21,7 @@
 #if GCC_MAJ_VERS > 2
 #include <istream>
 #else
-#include <istream.h>
+#include <istream>
 #endif
 #include <qpainter.h>
 #include <qcolor.h>