diff -Nru unity-7.5.0+19.04.20190217/debian/changelog unity-7.5.0+19.04.20190304/debian/changelog
--- unity-7.5.0+19.04.20190217/debian/changelog	2019-02-17 19:14:19.000000000 +0000
+++ unity-7.5.0+19.04.20190304/debian/changelog	2019-03-04 17:07:16.000000000 +0000
@@ -1,3 +1,10 @@
+unity (7.5.0+19.04.20190304-0ubuntu1) disco; urgency=medium
+
+  [ disco/unity: Failed to merge https://git.launchpad.net/unity. ]
+  * Add missing includes for build w/o pch
+
+ -- Marco Trevisan (Treviño) <mail@3v1n0.net>  Mon, 04 Mar 2019 17:07:16 +0000
+
 unity (7.5.0+19.04.20190217-0ubuntu1) disco; urgency=medium
 
   [ Andrea Azzarone ]
@@ -30,6 +37,20 @@
 
  -- Dmitry Shachnev <mitya57@ubuntu.com>  Thu, 03 Jan 2019 18:07:42 +0000
 
+<<<<<<<
+=======
+unity (7.5.0+18.10.20180926.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/gbp.conf: add default settings to use gbp-buildpackage
+  * debian: use native source format
+
+  [ Aleksey Tulinov ]
+  * Add missing includes for build w/o pch
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Sun, 04 Nov 2018 20:26:08 -0600
+
+>>>>>>>
 unity (7.5.0+18.10.20180926.2-0ubuntu1) cosmic; urgency=medium
 
   [ Alexander Hale ]
diff -Nru unity-7.5.0+19.04.20190217/launcher/DevicesSettingsImp.cpp unity-7.5.0+19.04.20190304/launcher/DevicesSettingsImp.cpp
--- unity-7.5.0+19.04.20190217/launcher/DevicesSettingsImp.cpp	2019-02-17 19:13:42.000000000 +0000
+++ unity-7.5.0+19.04.20190304/launcher/DevicesSettingsImp.cpp	2019-03-04 17:06:52.000000000 +0000
@@ -17,6 +17,7 @@
  * Authored by: Andrea Azzarone <andrea.azzarone@canonical.com>
  */
 
+#include <algorithm>
 #include <list>
 
 #include <gio/gio.h>
diff -Nru unity-7.5.0+19.04.20190217/launcher/FavoriteStoreGSettings.cpp unity-7.5.0+19.04.20190304/launcher/FavoriteStoreGSettings.cpp
--- unity-7.5.0+19.04.20190217/launcher/FavoriteStoreGSettings.cpp	2019-02-17 19:13:42.000000000 +0000
+++ unity-7.5.0+19.04.20190304/launcher/FavoriteStoreGSettings.cpp	2019-03-04 17:06:52.000000000 +0000
@@ -18,6 +18,8 @@
 *              Marco Trevisan <marco.trevisan@canonical.com>
 */
 
+#include <algorithm>
+
 #include <NuxCore/Logger.h>
 #include <UnityCore/DesktopUtilities.h>
 
diff -Nru unity-7.5.0+19.04.20190217/launcher/FavoriteStorePrivate.h unity-7.5.0+19.04.20190304/launcher/FavoriteStorePrivate.h
--- unity-7.5.0+19.04.20190217/launcher/FavoriteStorePrivate.h	2019-02-17 19:13:42.000000000 +0000
+++ unity-7.5.0+19.04.20190304/launcher/FavoriteStorePrivate.h	2019-03-04 17:06:52.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include <list>
 #include <string>
+#include <vector>
 
 namespace unity
 {
@@ -47,4 +48,3 @@
 } // namespace unity
 
 #endif
-
diff -Nru unity-7.5.0+19.04.20190217/UnityCore/GLibDBusServer.cpp unity-7.5.0+19.04.20190304/UnityCore/GLibDBusServer.cpp
--- unity-7.5.0+19.04.20190217/UnityCore/GLibDBusServer.cpp	2019-02-17 19:13:42.000000000 +0000
+++ unity-7.5.0+19.04.20190304/UnityCore/GLibDBusServer.cpp	2019-03-04 17:06:52.000000000 +0000
@@ -17,7 +17,9 @@
 * Authored by: Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
 */
 
+#include <algorithm>
 #include <unordered_map>
+
 #include <NuxCore/Logger.h>
 
 #include "GLibDBusServer.h"
diff -Nru unity-7.5.0+19.04.20190217/unity-shared/IconLoader.h unity-7.5.0+19.04.20190304/unity-shared/IconLoader.h
--- unity-7.5.0+19.04.20190217/unity-shared/IconLoader.h	2019-02-17 19:13:42.000000000 +0000
+++ unity-7.5.0+19.04.20190304/unity-shared/IconLoader.h	2019-03-04 17:06:52.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include <boost/utility.hpp>
 
+#include <functional>
 #include <memory>
 #include <gtk/gtk.h>
 #include <UnityCore/ActionHandle.h>