-#ifndef __SETUPH_BASE__
-#define __SETUPH_BASE__
-
-// compatibility code, to be removed asap:
-
-#if ! defined(__WXMSW__) && ! defined(__WXGTK__) && ! defined(__WXMOTIF__)
-# if defined(__WINDOWS__)
-# define __WXMSW__
-# elif defined(__GTK__)
-# define __WXGTK__
-# elif defined(__MOTIF__)
-# define __WXMOTIF__
-# elif defined(__QT__)
-# define __WXQT__
-# else
-# error No __WXxxx__ define set! Please define __WXGTK__,__WXMSW__ or __WXMOTIF__.
-# endif
+#ifndef _WX_SETUP_H_BASE_
+#define _WX_SETUP_H_BASE_
+
+/* compatibility code, to be removed asap: */
+
+#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
+#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
+#endif
+
+/*
+ wxUniversal is defined together with one of other ports, so test for it
+ first
+ */
+#ifdef __WXUNIVERSAL__
+#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
+#include "wx/univd/setup.h"
+#else
+#include "wx/univ/setup.h"