diff -rupN orig/configure hax/configure
--- orig/configure	2005-10-29 15:21:08.000000000 -0700
+++ hax/configure	2014-07-19 11:56:03.329394591 -0700
@@ -26978,9 +26978,6 @@ if test -z "$SHOWEQ_RPATH" && test "$USE
     SHOWEQ_RPATH="$SHOWEQ_RPATH -rpath \$(qt_libraries)"
   fi
 
-    if test -n "$X_LDFLAGS"; then
-    SHOWEQ_RPATH="$SHOWEQ_RPATH -rpath \$(x_libraries)"
-  fi
   if test -n "$SHOWEQ_EXTRA_RPATH"; then
     SHOWEQ_RPATH="$SHOWEQ_RPATH \$(SHOWEQ_EXTRA_RPATH)"
   fi
diff -rupN orig/src/itemdbtool.cpp hax/src/itemdbtool.cpp
--- orig/src/itemdbtool.cpp	2005-09-13 08:23:11.000000000 -0700
+++ hax/src/itemdbtool.cpp	2014-07-19 11:48:48.569934810 -0700
@@ -444,10 +444,6 @@ void displayVersion(EQItemDB* itemDB)
 #ifdef QT_VERSION_STR
   printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR);
 #endif
-#ifdef __linux__
-  printf ("\t\tUsing headers from linux version: %s\n",
-	  UTS_RELEASE);
-#endif
   printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
 #ifdef USE_DB3
   printf ("\tUsing DB3: %s\n", DB3Convenience::Version());
diff -rupN orig/src/main.cpp hax/src/main.cpp
--- orig/src/main.cpp	2005-10-05 08:29:08.000000000 -0700
+++ hax/src/main.cpp	2014-07-19 11:48:53.757833131 -0700
@@ -763,10 +763,6 @@ void displayVersion(void)
 #ifdef QT_VERSION_STR
   printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR);
 #endif
-#ifdef __linux__
-  printf ("\t\tUsing headers from linux version: %s\n",
-	  UTS_RELEASE);
-#endif
   printf ("\t\tUsing EQItemDB: %s\n", EQItemDB::Version());
   printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version());
 #ifdef USE_DB3
diff -rupN orig/src/mapicon.h hax/src/mapicon.h
--- orig/src/mapicon.h	2005-09-16 18:28:44.000000000 -0700
+++ hax/src/mapicon.h	2014-07-19 11:49:31.873086193 -0700
@@ -208,7 +208,7 @@ class MapIcon
  protected:
   // static paint methods
   typedef void (*IconImageFunction)(QPainter&p, const QPoint& point,
-				    int size, int size);
+				    int size, int sizeWH);
   static void paintNone(QPainter&p, const QPoint& point, 
 			int size, int sizeWH);
   static void paintCircle(QPainter&p, const QPoint& point, 
diff -rupN orig/src/messagefilterdialog.h hax/src/messagefilterdialog.h
--- orig/src/messagefilterdialog.h	2003-11-30 00:11:29.000000000 -0800
+++ hax/src/messagefilterdialog.h	2014-07-19 11:50:30.759929574 -0700
@@ -46,7 +46,7 @@ class MessageFilterDialog : public QDial
    void messageTypeSelectionChanged();
    void existingFilterSelectionChanged(QListBoxItem * item);
    void removedFilter(uint32_t mask, uint8_t filter);
-   void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+   void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& mfilter);
 
  protected:
    void clearFilter();
diff -rupN orig/src/messagefilter.h hax/src/messagefilter.h
--- orig/src/messagefilter.h	2003-11-28 07:22:27.000000000 -0800
+++ hax/src/messagefilter.h	2014-07-19 11:49:47.800773802 -0700
@@ -99,7 +99,7 @@ class MessageFilters : public QObject
 
  signals:
   void removed(uint32_t mask, uint8_t filter);
-  void added(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+  void added(uint32_t mask, uint8_t filter, const MessageFilter& mfilter);
 
  protected:
   MessageFilter* m_filters[maxMessageFilters];
diff -rupN orig/src/messages.h hax/src/messages.h
--- orig/src/messages.h	2003-11-17 15:34:20.000000000 -0800
+++ hax/src/messages.h	2014-07-19 11:50:05.496426109 -0700
@@ -49,7 +49,7 @@ class Messages : public QObject
 
  protected slots:
   void removedFilter(uint32_t mask, uint8_t filter);
-  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& mfilter);
    
  signals:
   void newMessage(const MessageEntry& message);
diff -rupN orig/src/messagewindow.h hax/src/messagewindow.h
--- orig/src/messagewindow.h	2003-11-17 15:34:20.000000000 -0800
+++ hax/src/messagewindow.h	2014-07-19 11:50:16.240214935 -0700
@@ -180,7 +180,7 @@ class MessageWindow : public SEQWindow
   void setCaption();
   virtual void restoreFont();
   void removedFilter(uint32_t mask, uint8_t filter);
-  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+  void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& mfilter);
 
  protected:
   void addMessage(const MessageEntry& message);
diff -rupN orig/src/spawnmonitor.h hax/src/spawnmonitor.h
--- orig/src/spawnmonitor.h	2005-09-13 08:07:09.000000000 -0700
+++ hax/src/spawnmonitor.h	2014-07-19 11:49:18.441349529 -0700
@@ -98,7 +98,7 @@ class SpawnMonitor: public QObject
 {
 Q_OBJECT
 public:
-  SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, 
+  SpawnMonitor(const DataLocationMgr* dataLocMgr, 
 			     ZoneMgr* zoneMgr, SpawnShell* spawnShell, 
 			     QObject* parent = 0, 
 			     const char* name = "spawnmonitor" );