diff --git a/acinclude.m4 b/acinclude.m4
index edc55c58c..fa3d0aa41 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -220,10 +220,11 @@ case $host_os in
     QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtNetwork.framework/Headers"
     QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtSvg.framework/Headers"
     QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtXml.framework/Headers"
+    QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtUiTools.framework/Headers"
 	# Separated flags
 	QT4_CORE_CXXFLAGS="-F$fc_qt4_frm -I$fc_qt4_frm/QtCore.framework/Headers"
     # QtUiTools doesn't seem to be available as framework
-    QT_CXXFLAGS="$QT_CXXFLAGS -I/usr/include/QtUiTools"
+    #QT_CXXFLAGS="$QT_CXXFLAGS -I/usr/include/QtUiTools"
     # QtWebKit check
     fc_ac_save_cppflags=$CPPFLAGS
     CPPFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtWebKit.framework/Headers"
diff --git a/src/Base/Stream.h b/src/Base/Stream.h
index f083e1e58..26bb4738c 100644
--- a/src/Base/Stream.h
+++ b/src/Base/Stream.h
@@ -25,6 +25,10 @@
 #define BASE_STREAM_H
 
 
+#ifdef __GNUC__
+# include <stdint.h>
+#endif
+
 #include <fstream>
 #include <ios>
 #include <iostream>
@@ -233,21 +237,21 @@ protected:
     static const int bufSize = 1024;    // size of the data buffer
     char buffer[bufSize+pbSize];        // data buffer
 };
-
-class BaseExport PyStreambuf : public std::streambuf
-{
-public:
-    PyStreambuf(PyObject* o);
-
-protected:
-    int underflow();
-
-private:
-    static const int pbSize = 4;
-    static const int bufSize = 1024;
-    char buffer[bufSize+pbSize];
-    PyObject* inp;
-};
+
+class BaseExport PyStreambuf : public std::streambuf
+{
+public:
+    PyStreambuf(PyObject* o);
+
+protected:
+    int underflow();
+
+private:
+    static const int pbSize = 4;
+    static const int bufSize = 1024;
+    char buffer[bufSize+pbSize];
+    PyObject* inp;
+};
 
 class BaseExport Streambuf : public std::streambuf
 {