--- audacity-src-1.3.8/src/AudacityApp.cpp.orig	2009-07-26 09:24:25.000000000 -0500
+++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-26 09:26:13.000000000 -0500
@@ -21,6 +21,10 @@ It handles initialization and terminatio
 #include <vld.h>
 #endif
 
+#define GSocket GlibGSocket
+#include <gtk/gtk.h>
+#undef GSocket
+
 #include "Audacity.h" // This should always be included first
 
 #include <wx/defs.h>
@@ -331,7 +334,8 @@ void QuitAudacity()
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <dlfcn.h>
-#include <gtk/gtk.h>
+#include <glib/gtypes.h>
+#include <glib-object.h>
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;