* Fixed build under R5/Dano that was broken since Stippi added vector icon support.

* Separated Haiku's icon stuff a bit better, so that Tracker can still be built
  without having Haiku headers around.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19871 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kits/tracker/Utilities.cpp

@@ -32,18 +32,21 @@ names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
 
-#include <ctype.h>
-#include <malloc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <stdarg.h>
+#include "Attributes.h"
+#include "MimeTypes.h"
+#include "Model.h"
+#include "Utilities.h"
+#include "ContainerWindow.h"
+
+#ifdef __HAIKU__
+#	include <IconUtils.h>
+#endif
 
 #include <Bitmap.h>
 #include <Debug.h>
 #include <Directory.h>
+#include <fs_attr.h>
 #include <fs_info.h>
-#include <IconUtils.h>
 #include <MenuItem.h>
 #include <OS.h>
 #include <PopUpMenu.h>
@@ -54,24 +57,23 @@ All rights reserved.
 #include <VolumeRoster.h>
 #include <Window.h>
 
+#include <ctype.h>
+#include <malloc.h>
+#include <string.h>
+#include <stdlib.h>
+#include <time.h>
+#include <stdarg.h>
+
+
 #if B_BEOS_VERSION_DANO
-#define _IMPEXP_BE
+#	define _IMPEXP_BE
 #endif
 extern _IMPEXP_BE const uint32	LARGE_ICON_TYPE;
 extern _IMPEXP_BE const uint32	MINI_ICON_TYPE;
 #if B_BEOS_VERSION_DANO
-#undef _IMPEXP_BE
+#	undef _IMPEXP_BE
 #endif
 
-#include "Attributes.h"
-#include "MimeTypes.h"
-#include "Model.h"
-#include "Utilities.h"
-#include "ContainerWindow.h"
-
-#include <fs_attr.h>
-
-
 
 FILE *logFile = NULL;