diff --git a/src/ui/tooltips.cpp b/src/ui/tooltips.cpp
index f1ddf5821..a02b21f59 100644
--- a/src/ui/tooltips.cpp
+++ b/src/ui/tooltips.cpp
@@ -8,13 +8,18 @@
 #include "config.h"
 #endif
 
+#include "ui/tooltips.h"
+
 #include "base/unique_ptr.h"
 #include "gfx/size.h"
 #include "ui/graphics.h"
 #include "ui/intern.h"
+#include "ui/manager.h"
+#include "ui/message.h"
 #include "ui/paint_event.h"
 #include "ui/preferred_size_event.h"
-#include "ui/ui.h"
+#include "ui/system.h"
+#include "ui/theme.h"
 
 #include <string>
 
diff --git a/src/ui/tooltips.h b/src/ui/tooltips.h
index 790b82430..94e57d431 100644
--- a/src/ui/tooltips.h
+++ b/src/ui/tooltips.h
@@ -11,6 +11,7 @@
 #include "base/unique_ptr.h"
 #include "ui/base.h"
 #include "ui/popup_window.h"
+#include "ui/timer.h"
 #include "ui/window.h"
 
 #include <map>