-#ifndef __TBARMSWH_BASE__
-#define __TBARMSWH_BASE__
+#ifndef _WX_TBARMSW_H_BASE_
+#define _WX_TBARMSW_H_BASE_
#if defined(__WXMSW__)
#include "wx/msw/tbarmsw.h"
#elif defined(__WXMOTIF__)
-#include "wx/xt/tbarmsw.h"
+#include "wx/motif/tbarmsw.h"
#elif defined(__WXGTK__)
#include "wx/gtk/tbarmsw.h"
+#elif defined(__WXPM__)
+#include "wx/os2/tbarmsw.h"
#endif
#endif
- // __TBARMSWH_BASE__
+ // _WX_TBARMSW_H_BASE_