diff --git a/src/add-ons/tracker/filetype/AppTypeAppFlagsView.cpp b/src/add-ons/tracker/filetype/AppTypeAppFlagsView.cpp
index eefb907791..887e36c165 100644
--- a/src/add-ons/tracker/filetype/AppTypeAppFlagsView.cpp
+++ b/src/add-ons/tracker/filetype/AppTypeAppFlagsView.cpp
@@ -1,4 +1,4 @@
-#include <AppTypeAppFlagsView.h>
+#include "AppTypeAppFlagsView.h"
 
 AppTypeAppFlagsView::AppTypeAppFlagsView(BRect viewFrame)
 	: BView(viewFrame, "AppTypeAppFlagsView", B_FOLLOW_ALL,
diff --git a/src/add-ons/tracker/filetype/AppTypeSupportedTypesView.cpp b/src/add-ons/tracker/filetype/AppTypeSupportedTypesView.cpp
index 230ab1b70e..7dfecf2958 100644
--- a/src/add-ons/tracker/filetype/AppTypeSupportedTypesView.cpp
+++ b/src/add-ons/tracker/filetype/AppTypeSupportedTypesView.cpp
@@ -1,4 +1,4 @@
-#include <AppTypeSupportedTypesView.h>
+#include "AppTypeSupportedTypesView.h"
 #include <SupportDefs.h>
 
 AppTypeSupportedTypesView::AppTypeSupportedTypesView(BRect viewFrame)
diff --git a/src/add-ons/tracker/filetype/AppTypeVersionInfoView.cpp b/src/add-ons/tracker/filetype/AppTypeVersionInfoView.cpp
index 427e60eb2f..0169f5e31e 100644
--- a/src/add-ons/tracker/filetype/AppTypeVersionInfoView.cpp
+++ b/src/add-ons/tracker/filetype/AppTypeVersionInfoView.cpp
@@ -1,4 +1,4 @@
-#include <AppTypeVersionInfoView.h>
+#include "AppTypeVersionInfoView.h"
 #include <SupportDefs.h>
 
 #include <stdio.h>
diff --git a/src/add-ons/tracker/filetype/AppTypeView.cpp b/src/add-ons/tracker/filetype/AppTypeView.cpp
index ee52a13219..b9d22bad3a 100644
--- a/src/add-ons/tracker/filetype/AppTypeView.cpp
+++ b/src/add-ons/tracker/filetype/AppTypeView.cpp
@@ -1,7 +1,7 @@
-#include <AppTypeView.h>
-#include <AppTypeAppFlagsView.h>
-#include <AppTypeSupportedTypesView.h>
-#include <AppTypeVersionInfoView.h>
+#include "AppTypeView.h"
+#include "AppTypeAppFlagsView.h"
+#include "AppTypeSupportedTypesView.h"
+#include "AppTypeVersionInfoView.h"
 
 AppTypeView::AppTypeView(BRect viewFrame)
 	: BBox(viewFrame, "AppTypeView", B_FOLLOW_ALL,
diff --git a/src/add-ons/tracker/filetype/AppTypeWindow.cpp b/src/add-ons/tracker/filetype/AppTypeWindow.cpp
index d26a9b613d..f001136753 100644
--- a/src/add-ons/tracker/filetype/AppTypeWindow.cpp
+++ b/src/add-ons/tracker/filetype/AppTypeWindow.cpp
@@ -7,9 +7,9 @@
 #include <String.h>
 #include <unistd.h>
 
-#include <FileTypeApp.h>
-#include <AppTypeView.h>
-#include <AppTypeWindow.h>
+#include "FileTypeApp.h"
+#include "AppTypeView.h"
+#include "AppTypeWindow.h"
 
 AppTypeWindow::AppTypeWindow(const BEntry * entry)
 	: BWindow(BRect(100,100,400,520),"Application Type",B_TITLED_WINDOW,
diff --git a/src/add-ons/tracker/filetype/FileTypeApp.cpp b/src/add-ons/tracker/filetype/FileTypeApp.cpp
index bdb29387c1..e443c9fe69 100644
--- a/src/add-ons/tracker/filetype/FileTypeApp.cpp
+++ b/src/add-ons/tracker/filetype/FileTypeApp.cpp
@@ -4,10 +4,10 @@
 #include <Roster.h>
 #include <stdio.h>
 
-#include <AppTypeWindow.h>
-#include <FileTypeApp.h>
-#include <FileTypeConstants.h>
-#include <FileTypeWindow.h>
+#include "AppTypeWindow.h"
+#include "FileTypeApp.h"
+#include "FileTypeConstants.h"
+#include "FileTypeWindow.h"
 
 FileTypeApp * file_type_app = 0;
 
diff --git a/src/add-ons/tracker/filetype/FileTypeView.cpp b/src/add-ons/tracker/filetype/FileTypeView.cpp
index b5aab8659b..51791fdc18 100644
--- a/src/add-ons/tracker/filetype/FileTypeView.cpp
+++ b/src/add-ons/tracker/filetype/FileTypeView.cpp
@@ -2,7 +2,7 @@
 #include <Message.h>
 #include <Mime.h>
 #include <Window.h>
-#include <FileTypeView.h>
+#include "FileTypeView.h"
 
 FileTypeView::FileTypeView(BRect viewFrame)
 	: BBox(viewFrame, "FileTypeView", B_FOLLOW_ALL,
diff --git a/src/add-ons/tracker/filetype/FileTypeWindow.cpp b/src/add-ons/tracker/filetype/FileTypeWindow.cpp
index 4ca6d9757d..41f92e3be2 100644
--- a/src/add-ons/tracker/filetype/FileTypeWindow.cpp
+++ b/src/add-ons/tracker/filetype/FileTypeWindow.cpp
@@ -5,9 +5,9 @@
 #include <Node.h>
 #include <NodeInfo.h>
 
-#include <FileTypeApp.h>
-#include <FileTypeView.h>
-#include <FileTypeWindow.h>
+#include "FileTypeApp.h"
+#include "FileTypeView.h"
+#include "FileTypeWindow.h"
 
 FileTypeWindow::FileTypeWindow(const BList * entryList)
 	: BWindow(BRect(100,100,380,300),"File Type",B_TITLED_WINDOW,
diff --git a/src/add-ons/tracker/filetype/main.cpp b/src/add-ons/tracker/filetype/main.cpp
index e2cde5a8df..63a5fdd036 100644
--- a/src/add-ons/tracker/filetype/main.cpp
+++ b/src/add-ons/tracker/filetype/main.cpp
@@ -1,4 +1,4 @@
-#include <FileTypeApp.h>
+#include "FileTypeApp.h"
 
 int
 main()
diff --git a/src/add-ons/tracker/filetype/process_refs.cpp b/src/add-ons/tracker/filetype/process_refs.cpp
index 2a283451df..8ee2d02fe1 100644
--- a/src/add-ons/tracker/filetype/process_refs.cpp
+++ b/src/add-ons/tracker/filetype/process_refs.cpp
@@ -1,4 +1,4 @@
-#include <FileTypeConstants.h>
+#include "FileTypeConstants.h"
 #include <TrackerAddOn.h>
 #include <Roster.h>
 
diff --git a/src/add-ons/tracker/zipomatic/GenericThread.cpp b/src/add-ons/tracker/zipomatic/GenericThread.cpp
index 3006520817..ee496a2233 100644
--- a/src/add-ons/tracker/zipomatic/GenericThread.cpp
+++ b/src/add-ons/tracker/zipomatic/GenericThread.cpp
@@ -1,7 +1,7 @@
 // license: public domain
 // authors: jonas.sundstrom@kirilla.com
 
-#include <GenericThread.h>
+#include "GenericThread.h"
 
 GenericThread::GenericThread(const char * a_thread_name, int32 a_priority, BMessage * a_message)	
 	:
diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
index 350c54327c..90098cef4e 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
@@ -5,9 +5,9 @@
 #include <Roster.h>
 #include <Debug.h>
 
-#include <ZipOMatic.h>
-#include <ZipOMaticMisc.h>
-#include <ZipOMaticWindow.h>
+#include "ZipOMatic.h"
+#include "ZipOMaticMisc.h"
+#include "ZipOMaticWindow.h"
 
 extern "C" void 
 process_refs(entry_ref dir_ref, BMessage * msg, void *)
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticActivity.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticActivity.cpp
index 7a85cc7400..da84f7c9cd 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticActivity.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticActivity.cpp
@@ -1,7 +1,7 @@
 // license: public domain
 // authors: jonas.sundstrom@kirilla.com
 
-#include <ZipOMaticActivity.h>
+#include "ZipOMaticActivity.h"
 
 Activity::Activity (BRect a_rect, const char * a_name, uint32 a_resizing_mode, uint32 a_flags)
 :	BBox 				(a_rect, a_name, a_resizing_mode, a_flags),
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticMisc.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticMisc.cpp
index 4f24ffbec4..f719e13d8a 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticMisc.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticMisc.cpp
@@ -1,7 +1,7 @@
 // license: public domain
 // authors: jonas.sundstrom@kirilla.com
 
-#include <ZipOMaticMisc.h>
+#include "ZipOMaticMisc.h"
 
 #include <Debug.h>
 
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticSettings.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticSettings.cpp
index bcfa50797a..b24fe3c768 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticSettings.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticSettings.cpp
@@ -13,8 +13,8 @@
 #include <Path.h>
 #include <File.h>
 
-#include <ZipOMaticMisc.h>
-#include <ZipOMaticSettings.h>
+#include "ZipOMaticMisc.h"
+#include "ZipOMaticSettings.h"
 
 ZippoSettings::ZippoSettings()
 :	BMessage		 	(),
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticView.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticView.cpp
index 188496a4b7..313e40399b 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticView.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticView.cpp
@@ -1,8 +1,8 @@
 // license: public domain
 // authors: jonas.sundstrom@kirilla.com
 
-#include <ZipOMaticActivity.h>
-#include <ZipOMaticView.h>
+#include "ZipOMaticActivity.h"
+#include "ZipOMaticView.h"
 
 ZippoView::ZippoView (BRect a_rect)
 :	BBox (a_rect, "zipomatic_view", B_FOLLOW_ALL, 
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
index dff3485b95..86e953c237 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
@@ -15,12 +15,12 @@
 #include <Path.h>
 #include <File.h>
 
-#include <ZipOMatic.h>
-#include <ZipOMaticActivity.h>
-#include <ZipOMaticMisc.h>
-#include <ZipOMaticView.h>
-#include <ZipOMaticWindow.h>
-#include <ZipOMaticZipper.h>
+#include "ZipOMatic.h"
+#include "ZipOMaticActivity.h"
+#include "ZipOMaticMisc.h"
+#include "ZipOMaticView.h"
+#include "ZipOMaticWindow.h"
+#include "ZipOMaticZipper.h"
 
 ZippoWindow::ZippoWindow(BMessage * a_message)
 : BWindow(BRect(200,200,430,310), "Zip-O-Matic", B_TITLED_WINDOW, B_NOT_V_RESIZABLE), // | B_NOT_ZOOMABLE),
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h
index 9382a817ab..d7cfaefb80 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.h
@@ -7,7 +7,7 @@
 #include <Menu.h>
 #include <MenuItem.h>
 
-#include <ZipOMaticSettings.h>
+#include "ZipOMaticSettings.h"
 class ZippoView;
 class ZipperThread;
 
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticZipper.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticZipper.cpp
index 71224f14b0..7ceb622c38 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticZipper.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticZipper.cpp
@@ -9,9 +9,9 @@
 
 #include <Path.h>
 
-#include <ZipOMaticZipper.h>
-#include <ZipOMaticWindow.h>
-#include <ZipOMaticMisc.h>
+#include "ZipOMaticZipper.h"
+#include "ZipOMaticWindow.h"
+#include "ZipOMaticMisc.h"
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticZipper.h b/src/add-ons/tracker/zipomatic/ZipOMaticZipper.h
index 3560ac9c0c..181e95f6f1 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticZipper.h
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticZipper.h
@@ -8,7 +8,7 @@
 #include <OS.h> 
 #include <FindDirectory.h> 
 
-#include <GenericThread.h>
+#include "GenericThread.h"
 #include <stdlib.h>
 
 extern const char * ZipperThreadName;