diff -r 8a081444a89a -r c19d273a9e76 tool/CommandSiiRead.cpp
--- a/tool/CommandSiiRead.cpp	Thu Oct 09 13:23:07 2008 +0000
+++ b/tool/CommandSiiRead.cpp	Thu Oct 09 13:24:17 2008 +0000
@@ -9,7 +9,6 @@
 using namespace std;
 
 #include "CommandSiiRead.h"
-#include "byteorder.h"
 
 /*****************************************************************************/
 
@@ -99,7 +98,7 @@
         if (data.nwords > 0x0040U) {
             // cycle through categories
             categoryHeader = data.words + 0x0040U;
-            categoryType = le16tocpu(*categoryHeader);
+            categoryType = le16_to_cpup(categoryHeader);
             while (categoryType != 0xffff) {
                 cout << "SII Category 0x" << hex
                     << setw(4) << categoryType
@@ -109,7 +108,7 @@
                     err << "SII data seem to be corrupted!";
                     throwCommandException(err);
                 }
-                categorySize = le16tocpu(*(categoryHeader + 1));
+                categorySize = le16_to_cpup(categoryHeader + 1);
                 cout << ", " << dec << categorySize << " words" << flush;
 
                 if (categoryHeader + 2 + categorySize
@@ -136,7 +135,7 @@
                     throwCommandException(err);
                 }
                 categoryHeader += 2 + categorySize;
-                categoryType = le16tocpu(*categoryHeader);
+                categoryType = le16_to_cpup(categoryHeader);
             }
         }
     } else {