Index: grip-3.3.1/src/cdplay.c
===================================================================
--- grip-3.3.1.orig/src/cdplay.c	2005-06-26 04:00:55.000000000 +1000
+++ grip-3.3.1/src/cdplay.c	2005-08-12 17:10:19.000000000 +1000
@@ -30,6 +30,7 @@
 #include "dialog.h"
 #include "rip.h"
 #include "grip_id3.h"
+#include "tray.h"
 
 static void ShutDownCB(GtkWidget *widget,gpointer data);
 static void DiscDBToggle(GtkWidget *widget,gpointer data);
Index: grip-3.3.1/src/common.h
===================================================================
--- grip-3.3.1.orig/src/common.h	2005-01-30 05:34:17.000000000 +1100
+++ grip-3.3.1/src/common.h	2005-08-12 21:26:00.000000000 +1000
@@ -20,6 +20,9 @@
  * USA
  */
 
+#ifndef GRIP_COMMON_H
+#define GRIP_COMMON_H
+
 #include <gnome.h>
 
 /* Routines from main.c */
@@ -37,3 +40,5 @@ GtkWidget *Loadxpm(GtkWidget *widget,cha
 void CopyPixmap(GtkPixmap *src,GtkPixmap *dest);
 gint SizeInDubs(GdkFont *font,gint numchars);
 void UpdateGTK(void);
+
+#endif /* GRIP_COMMON_H */
Index: grip-3.3.1/src/discdb.c
===================================================================
--- grip-3.3.1.orig/src/discdb.c	2005-06-26 04:23:13.000000000 +1000
+++ grip-3.3.1/src/discdb.c	2005-08-12 21:31:59.000000000 +1000
@@ -170,7 +170,7 @@ static char *DiscDBMakeRequest(DiscDBSer
 			       char *cmd)
 {
   GString *uri;
-  GString *proxy,*user;
+  GString *proxy=NULL,*user=NULL;
   char user_agent[256];
   struct curl_slist *headers=NULL;
   FILE *outfile;
Index: grip-3.3.1/src/launch.c
===================================================================
--- grip-3.3.1.orig/src/launch.c	2005-06-26 04:00:55.000000000 +1000
+++ grip-3.3.1/src/launch.c	2005-08-12 21:24:51.000000000 +1000
@@ -204,7 +204,7 @@ char *MungeString(char *str,StrTransPref
     utf8_char[utf8_char_len]='\0';
     filename_char=g_filename_from_utf8(utf8_char,-1,&rb,&wb,NULL);
     g_free(filename_char);
-    if (!filename_char || !prefs->allow_high_bits && *c >> 7) {
+    if (!filename_char || (!prefs->allow_high_bits && *c >> 7)) {
       if (prefs->escape) {
 	g_snprintf(escape,11,"(%x)",*c);
 	dst=ReallocStrcat(dst,escape);
Index: grip-3.3.1/src/status_window.c
===================================================================
--- grip-3.3.1.orig/src/status_window.c	2004-04-16 04:21:37.000000000 +1000
+++ grip-3.3.1/src/status_window.c	2005-08-12 19:50:43.000000000 +1000
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <vte/vte.h>
Index: grip-3.3.1/src/tray.c
===================================================================
--- grip-3.3.1.orig/src/tray.c	2005-01-30 05:34:17.000000000 +1100
+++ grip-3.3.1/src/tray.c	2005-08-12 21:23:23.000000000 +1000
@@ -21,6 +21,9 @@
  */
 
 #include "tray.h"
+#include "common.h"
+#include "cdplay.h"
+#include "rip.h"
 #include "../pixmaps/rip1.xpm"
 #include "../pixmaps/menuplay.xpm"
 #include "../pixmaps/menupause.xpm"