diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index d90f90f6f0..76666bcdb1 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/intl.h"
+#include "wx/wx.h"
 #endif
 
 #include "wx/spinbutt.h"
diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index dde56c65ee..cd0a8670e3 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -11,6 +11,8 @@
     #pragma implementation "tooltip.h"
 #endif
 
+#ifdef wxUSE_TOOLTIPS
+
 #include "wx/window.h"
 #include "wx/tooltip.h"
 
@@ -86,4 +88,5 @@ void wxToolTip::SetDelay( long msecs )
 
     gtk_tooltips_set_delay( ss_tooltips, msecs );
 }
+#endif
 
diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index dde56c65ee..cd0a8670e3 100644
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -11,6 +11,8 @@
     #pragma implementation "tooltip.h"
 #endif
 
+#ifdef wxUSE_TOOLTIPS
+
 #include "wx/window.h"
 #include "wx/tooltip.h"
 
@@ -86,4 +88,5 @@ void wxToolTip::SetDelay( long msecs )
 
     gtk_tooltips_set_delay( ss_tooltips, msecs );
 }
+#endif