diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 437d59b8daa39f6c7445df84991cc76bb5f467de..30b3aae4da4e092e24622db4bd39d3208a27d143 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ variables:
                   yelp-tools
 
 .build-libwnck: &build-libwnck
-  - git clone https://gitlab.gnome.org/GNOME/libwnck.git
+  - git clone https://gitlab.gnome.org/GNOME/libwnck.git -b wip/muktupavels/widgets
   - meson setup libwnck libwnck/build --prefix /usr -Dintrospection=disabled
   - meson install -C libwnck/build
 
diff --git a/configure.ac b/configure.ac
index e6d3e188d1da66ba63bbb084f3e79798b3faf37b..201a85e32ae29196502b50b8959c4edebca71e74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,7 @@ PKG_CHECK_MODULES([STATUS_NOTIFIER], [
   gtk+-3.0 >= $GTK_REQUIRED
 ])
 
-PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-4.0 >= $LIBWNCK_REQUIRED)
+PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-gtk3-4.0 >= $LIBWNCK_REQUIRED)
 AC_SUBST(WNCKLET_CFLAGS)
 AC_SUBST(WNCKLET_LIBS)
 
diff --git a/modules/wncklet/showdesktop.c b/modules/wncklet/showdesktop.c
index 9f511b471b0a36e8fe8fc11f631e5e2df5ebbf96..ca9f1d2dcc7dca294b7776e0603adf3a40c95575 100644
--- a/modules/wncklet/showdesktop.c
+++ b/modules/wncklet/showdesktop.c
@@ -21,7 +21,7 @@
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/window-list.c b/modules/wncklet/window-list.c
index 0ee231fe9942db43826246a9c67471868955357a..37670f483cbc9e8bfa6c1c8955c8d6c61c042f1d 100644
--- a/modules/wncklet/window-list.c
+++ b/modules/wncklet/window-list.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/window-menu.c b/modules/wncklet/window-menu.c
index 74e4d380bfa2b1a5df45c060732d8c428d93f0a8..400f43b4830e86167c8c25e751ae19478df8f0c7 100644
--- a/modules/wncklet/window-menu.c
+++ b/modules/wncklet/window-menu.c
@@ -26,7 +26,7 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/wncklet-module.c b/modules/wncklet/wncklet-module.c
index 6ad6c4b6bcd4b14f6c0e4172e0a0f0a5115dab14..2533fbba12f154c781a7960c65ed30bbbf5ac484 100644
--- a/modules/wncklet/wncklet-module.c
+++ b/modules/wncklet/wncklet-module.c
@@ -19,7 +19,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <libgnome-panel/gp-module.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 
 #include "showdesktop.h"
 #include "window-list.h"
diff --git a/modules/wncklet/wncklet.c b/modules/wncklet/wncklet.c
index 201196dcd5174acb1b0e949d49cbaed596bbf1a6..2f457d0bde85d1c6d77f61be3252be8c387cfb15 100644
--- a/modules/wncklet/wncklet.c
+++ b/modules/wncklet/wncklet.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/wncklet.h b/modules/wncklet/wncklet.h
index 261db8093a18d9350b044f4d51ec4b28645a8e04..5da9b41208c06a34be20a2ed999b87b2c3d846ef 100644
--- a/modules/wncklet/wncklet.h
+++ b/modules/wncklet/wncklet.h
@@ -22,7 +22,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 
 #define WNCKLET_RESOURCE_PATH "/org/gnome/panel/applet/wncklet/"
 
diff --git a/modules/wncklet/workspace-switcher.c b/modules/wncklet/workspace-switcher.c
index e2cb1e6f2c8091845614f51fdbf915ecd0588aa0..0050e6872c950700da8f29ea29e4d557866ee689 100644
--- a/modules/wncklet/workspace-switcher.c
+++ b/modules/wncklet/workspace-switcher.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <stdlib.h>
 #include <string.h>