diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
index 5f6c36f5cf5..073422f1cda 100644
--- a/dlls/uxtheme/metric.c
+++ b/dlls/uxtheme/metric.c
@@ -165,9 +165,7 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue)
  */
 int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID)
 {
-    PTHEME_PROPERTY tp;
-    int i, id = -1;
-    int metricMap[] = {
+    static const int metricMap[] = {
         SM_CXVSCROLL, TMT_SCROLLBARWIDTH,
         SM_CYHSCROLL, TMT_SCROLLBARHEIGHT,
         SM_CXSIZE, TMT_CAPTIONBARWIDTH,
@@ -179,6 +177,8 @@ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID)
         SM_CXMENUSIZE, TMT_MENUBARWIDTH,
         SM_CYMENUSIZE, TMT_MENUBARHEIGHT
     };
+    PTHEME_PROPERTY tp;
+    int i, id = -1;
 
     if(hTheme) {
         for(i=0; i<ARRAY_SIZE(metricMap); i+=2) {
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index db497544f93..c898ad32e2f 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -813,7 +813,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName,
                                              LPWSTR pszValueBuff,
                                              int cchMaxValChars)
 {
-    const WORD wDocToRes[] = {
+    static const WORD wDocToRes[] = {
         TMT_DISPLAYNAME,5000,
         TMT_TOOLTIP,5001,
         TMT_COMPANY,5002,