diff --git a/api/boinc_api.h b/api/boinc_api.h
index cc1d2390fc..cba6d0725d 100755
--- a/api/boinc_api.h
+++ b/api/boinc_api.h
@@ -87,7 +87,9 @@ extern APP_INIT_DATA aid;
 /////////// IMPLEMENTATION STUFF BEGINS HERE
 
 extern APP_CLIENT_SHM *app_client_shm;
+#ifdef _WIN32
 extern HANDLE worker_thread_handle;
+#endif
 
 /////////// IMPLEMENTATION STUFF ENDS HERE
 
diff --git a/checkin_notes b/checkin_notes
index 734b22142d..be1c1fa5bf 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -18830,3 +18830,15 @@ David  25 Oct 2004
 	api/
 		boinc_api.C,h
 		graphics_api.C
+
+David  25 Oct 2004
+    - fix compile errors.
+        I conditionally commented out stuff related to taskbar icon
+        in the BOINC GUI code,
+        since taskbar icon doesn't seem to exist on X11/GTK
+
+    api/
+        boinc_api.h
+    clientgui/
+        BOINCGUIApp.cpp,h
+        Makefile.old
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 93fcaa8720..a74c0208c4 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -74,9 +74,11 @@ bool CBOINCGUIApp::OnInit()
     m_pFrame = new CMainFrame(GetAppName());
     wxASSERT(NULL != m_pFrame);
 
+#ifndef NOTASKBAR
     // Initialize the task bar icon
     m_pTaskBarIcon = new CTaskBarIcon();
     wxASSERT(NULL != m_pTaskBarIcon);
+#endif
 
     SetTopWindow(m_pFrame);
     m_pFrame->Show();
@@ -87,8 +89,10 @@ bool CBOINCGUIApp::OnInit()
 
 int CBOINCGUIApp::OnExit()
 {
+#ifndef NOTASKBAR
     if (m_pTaskBarIcon)
         delete m_pTaskBarIcon;
+#endif
 
     if (m_pDocument)
     {
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index d39ae48c99..2313fb07ec 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -31,7 +31,9 @@
 
 #include "MainFrame.h"
 #include "MainDocument.h"
+#ifndef NOTASKBAR
 #include "TaskBarIcon.h"
+#endif
 
 
 class CBOINCGUIApp : public wxApp
@@ -52,7 +54,9 @@ protected:
 
     CMainFrame*     m_pFrame;
     CMainDocument*  m_pDocument;
+#ifndef NOTASKBAR
     CTaskBarIcon*   m_pTaskBarIcon;
+#endif
 
 public:
 
@@ -60,7 +64,9 @@ public:
 
     CMainFrame*     GetFrame()       { return m_pFrame; };
     CMainDocument*  GetDocument()    { return m_pDocument; };
+#ifndef NOTASKBAR
     CTaskBarIcon*   GetTaskBarIcon() { return m_pTaskBarIcon; };
+#endif
 
 };
 
diff --git a/clientgui/Makefile.old b/clientgui/Makefile.old
index 383d9796a5..d58ec31c96 100644
--- a/clientgui/Makefile.old
+++ b/clientgui/Makefile.old
@@ -1,9 +1,9 @@
 CXX = $(shell wx-config --cxx)
 
 # comment out the following as needed
-OTHER_LIBS = -lsocket -lnsl
+#OTHER_LIBS = -lsocket -lnsl
 
-CFLAGS = -g -I ../lib
+CFLAGS = -g -I ../lib -DNOTASKBAR
 
 PROGRAM = boinc_gui