diff --git a/include/wx/systhemectrl.h b/include/wx/systhemectrl.h
index 597288e166..0b9a9ab6ba 100644
--- a/include/wx/systhemectrl.h
+++ b/include/wx/systhemectrl.h
@@ -48,7 +48,7 @@ protected:
 };
 
 // Only __WXMSW__ has a non-trivial implementation currently.
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #define wxHAS_SYSTEM_THEMED_CONTROL
 #endif
 
diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 5e7dfa9731..9dfc85fb85 100644
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -26,7 +26,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
-#ifndef __WXMSW__
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
     #define wxHAS_GENERIC_TREECTRL
 #endif