diff --git a/minuitwrp/Android.bp b/minuitwrp/Android.bp
index 137e7fa..bfd0942 100644
--- a/minuitwrp/Android.bp
+++ b/minuitwrp/Android.bp
@@ -29,6 +29,7 @@
         "system/core/include",
         "external/freetype/include",
         "external/libcxx/include",
+        "bootable/recovery",
         "bootable/recovery/twrpinstall/include",
         "bootable/recovery/libpixelflinger/include",
         "bootable/recovery/minuitwrp/include",
diff --git a/minuitwrp/events.cpp b/minuitwrp/events.cpp
index b5e5a14..e497df6 100644
--- a/minuitwrp/events.cpp
+++ b/minuitwrp/events.cpp
@@ -50,6 +50,7 @@
 #endif
 
 #include "common.h"
+#include "twcommon.h"
 
 #include "minuitwrp/minui.h"
 
diff --git a/twcommon.h b/twcommon.h
index 0455fc6..0ac0729 100644
--- a/twcommon.h
+++ b/twcommon.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2017 TeamWin
+    Copyright 2024 TeamWin
     This file is part of TWRP/TeamWin Recovery Project.
 
     TWRP is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #define gui_print(...) printf( __VA_ARGS__ )
 #endif
 
-#define STRINGIFY(x...) #x
+#define STRINGIFY(...) #__VA_ARGS__
 #define EXPAND(x) STRINGIFY(x)
 
 #ifdef __cplusplus
diff --git a/twrpinstall/include/common.h b/twrpinstall/include/common.h
index 1d1f61c..5532db8 100755
--- a/twrpinstall/include/common.h
+++ b/twrpinstall/include/common.h
@@ -34,9 +34,6 @@
 #define LOGD(...) do {} while (0)
 #endif
 
-#define STRINGIFY(x...) #x
-#define EXPAND(x) STRINGIFY(x)
-
 // Not using the command-line defined macro here because this header could be included by
 // device-specific recovery libraries. We static assert the value consistency in recovery.cpp.
 //static constexpr int kRecoveryApiVersion = 3;
diff --git a/twrpinstall/installcommand.cpp b/twrpinstall/installcommand.cpp
index 3b587b9..e4e5366 100755
--- a/twrpinstall/installcommand.cpp
+++ b/twrpinstall/installcommand.cpp
@@ -28,6 +28,7 @@
 #include <cutils/properties.h>
 
 #include "common.h"
+#include "twcommon.h"
 #include "installcommand.h"
 #include <ziparchive/zip_archive.h>
 #include "twinstall/install.h"