5 files changed, 9 insertions, 7 deletions
diff --git a/homescreen/src/hmi-debug.h b/homescreen/src/hmi-debug.h
index 47ae1f7..ea9bae8 100644
--- a/homescreen/src/hmi-debug.h
+++ b/homescreen/src/hmi-debug.h
@@ -49,7 +49,6 @@ static void _HMI_LOG(enum LOG_LEVEL level, const char* file, const char* func, c
     struct timespec tp;
     uint32_t time;
     va_list args;
-    int ret;
     const int log_level = (getenv("USE_HMI_DEBUG") == NULL) ? LOG_LEVEL_ERROR : atoi(getenv("USE_HMI_DEBUG"));
 
     if(log_level < level) {
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index 920c054..2858ef4 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -11,7 +11,8 @@
 #include "homescreenhandler.h"
 #include "hmi-debug.h"
 
-#include <qpa/qplatformnativeinterface.h>
+// defined by meson build file
+#include QT_QPA_HEADER
 
 // LAUNCHER_APP_ID shouldn't be started by applaunchd as it is started as
 // a user session by systemd
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 8c3391f..c910727 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -25,10 +25,11 @@
 #include "homescreenhandler.h"
 #include "hmi-debug.h"
 
-#include <qpa/qplatformnativeinterface.h>
+// meson will define these
+#include QT_QPA_HEADER
 #include <wayland-client.h>
 
-#include "wayland-agl-shell-client-protocol.h"
+#include "agl-shell-client-protocol.h"
 #include "shell.h"
 
 #ifndef MIN
diff --git a/homescreen/src/shell.cpp b/homescreen/src/shell.cpp
index 1427b7c..ffb4439 100644
--- a/homescreen/src/shell.cpp
+++ b/homescreen/src/shell.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Collabora Ltd.
+ * Copyright © 2019, 2022 Collabora Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -26,7 +26,8 @@
 #include <QGuiApplication>
 #include <QDebug>
 #include "shell.h"
-#include <qpa/qplatformnativeinterface.h>
+// defined by meson build file
+#include QT_QPA_HEADER
 #include <stdio.h>
 
 static struct wl_output *
diff --git a/homescreen/src/shell.h b/homescreen/src/shell.h
index 8bf0e9b..a6e3f7e 100644
--- a/homescreen/src/shell.h
+++ b/homescreen/src/shell.h
@@ -32,7 +32,7 @@
 #include <QScreen>
 #include <QWindow>
 #include <memory>
-#include "wayland-agl-shell-client-protocol.h"
+#include "agl-shell-client-protocol.h"
 
 /*
  * Basic type to wrap the agl_shell wayland object into a QObject, so that it