-#ifndef __ICONH_BASE__
-#define __ICONH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/icon.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/icon.h"
-#elif defined(__GTK__)
-#include "wx/gtk/icon.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/icon.h
+// Purpose: wxIcon base header
+// Author: Julian Smart
+// Modified by:
+// Created:
+// Copyright: (c) Julian Smart
+// RCS-ID: $Id$
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_ICON_H_BASE_
+#define _WX_ICON_H_BASE_
+
+#include "wx/iconloc.h"
+
+#if defined(__WXPALMOS__)
+ #include "wx/palmos/icon.h"
+#elif defined(__WXMSW__)
+ #include "wx/msw/icon.h"
+#elif defined(__WXMOTIF__)
+ #include "wx/motif/icon.h"
+#elif defined(__WXGTK20__)
+ #include "wx/gtk/icon.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/icon.h"
+#elif defined(__WXX11__)
+ #include "wx/x11/icon.h"
+#elif defined(__WXMGL__)
+ #include "wx/mgl/icon.h"
+#elif defined(__WXMAC__)
+ #include "wx/mac/icon.h"
+#elif defined(__WXCOCOA__)
+ #include "wx/cocoa/icon.h"
+#elif defined(__WXPM__)
+ #include "wx/os2/icon.h"