aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-10-19 21:18:09 +0000
committerstuconnolly <stuart02@gmail.com>2010-10-19 21:18:09 +0000
commit3e67e208428399a6f802cffe0e6966f89b39e254 (patch)
treed95bc14312e20d31db4a21f2c8dd5c1e2cf352ac /Source
parentee085902c3312eb623fbafaca2d59b3260385e72 (diff)
downloadsequelpro-3e67e208428399a6f802cffe0e6966f89b39e254.tar.gz
sequelpro-3e67e208428399a6f802cffe0e6966f89b39e254.tar.bz2
sequelpro-3e67e208428399a6f802cffe0e6966f89b39e254.zip
Considering nearly every class uses constants, import it via the prefix header.
Diffstat (limited to 'Source')
-rw-r--r--Source/SPAppController.m1
-rw-r--r--Source/SPAppleScriptSupport.m1
-rw-r--r--Source/SPConnectionController.h1
-rw-r--r--Source/SPConnectionController.m1
-rw-r--r--Source/SPConnectionDelegate.m1
-rw-r--r--Source/SPContentFilterManager.m1
-rw-r--r--Source/SPCopyTable.m1
-rw-r--r--Source/SPCustomQuery.m1
-rw-r--r--Source/SPDataCellFormatter.m1
-rw-r--r--Source/SPDataImport.m2
-rw-r--r--Source/SPDatabaseDocument.m2
-rw-r--r--Source/SPDotExporter.m1
-rw-r--r--Source/SPEditSheetTextView.m1
-rw-r--r--Source/SPExportController.h2
-rw-r--r--Source/SPExportController.m1
-rw-r--r--Source/SPExportFile.h2
-rw-r--r--Source/SPExporter.h2
-rw-r--r--Source/SPExtendedTableInfo.m1
-rw-r--r--Source/SPFieldEditorController.m1
-rw-r--r--Source/SPFieldMapperController.m1
-rw-r--r--Source/SPFileHandle.h9
-rw-r--r--Source/SPGrowlController.m1
-rw-r--r--Source/SPHistoryController.m1
-rw-r--r--Source/SPIndexesController.m1
-rw-r--r--Source/SPNarrowDownCompletion.m3
-rw-r--r--Source/SPNavigatorController.m1
-rw-r--r--Source/SPPreferenceController.h4
-rw-r--r--Source/SPPrintController.m1
-rw-r--r--Source/SPProcessListController.m1
-rw-r--r--Source/SPQueryController.m1
-rw-r--r--Source/SPQueryFavoriteManager.m1
-rw-r--r--Source/SPSQLExporter.h1
-rw-r--r--Source/SPSQLExporter.m1
-rw-r--r--Source/SPSSHTunnel.m1
-rw-r--r--Source/SPServerVariablesController.m1
-rw-r--r--Source/SPTableContent.m1
-rw-r--r--Source/SPTableData.m1
-rw-r--r--Source/SPTableInfo.m1
-rw-r--r--Source/SPTableRelations.m1
-rw-r--r--Source/SPTableStructure.m1
-rw-r--r--Source/SPTableTriggers.m1
-rw-r--r--Source/SPTableView.m1
-rw-r--r--Source/SPTablesList.m1
-rw-r--r--Source/SPTextAndLinkCell.m1
-rw-r--r--Source/SPTextView.m1
-rw-r--r--Source/SPTextViewAdditions.m1
-rw-r--r--Source/SPWindowController.m4
-rw-r--r--Source/SPXMLExporter.m1
-rw-r--r--Source/Sequel-Pro.pch25
-rw-r--r--Source/SequelProTunnelAssistant.m2
50 files changed, 32 insertions, 64 deletions
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index c619b3a4..0589b1d2 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -30,7 +30,6 @@
#import "SPAboutController.h"
#import "SPDataImport.h"
#import "SPEncodingPopupAccessory.h"
-#import "SPConstants.h"
#import "SPWindowController.h"
#import <PSMTabBar/PSMTabBarControl.h>
diff --git a/Source/SPAppleScriptSupport.m b/Source/SPAppleScriptSupport.m
index 73975a26..ea390ab9 100644
--- a/Source/SPAppleScriptSupport.m
+++ b/Source/SPAppleScriptSupport.m
@@ -25,7 +25,6 @@
#import "SPAppleScriptSupport.h"
#import "SPWindowController.h"
-#import "SPConstants.h"
@implementation SPAppController (SPAppleScriptSupport)
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index 6c5863b9..47bd5d0a 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -29,7 +29,6 @@
#import "SPDatabaseDocument.h"
#import "SPKeychain.h"
#import "SPSSHTunnel.h"
-#import "SPConstants.h"
@class BWAnchoredButtonBar;
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index b9d53025..7891ff1e 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -28,7 +28,6 @@
#import "SPPreferenceController.h"
#import "ImageAndTextCell.h"
#import "RegexKitLite.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
@interface SPConnectionController (PrivateAPI)
diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m
index b1e586f1..4b928652 100644
--- a/Source/SPConnectionDelegate.m
+++ b/Source/SPConnectionDelegate.m
@@ -27,7 +27,6 @@
#import "SPConnectionController.h"
#import "SPQueryController.h"
#import "SPKeychain.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
@implementation SPDatabaseDocument (SPConnectionDelegate)
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index 26114a2e..6f301c12 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -28,7 +28,6 @@
#import "RegexKitLite.h"
#import "SPQueryController.h"
#import "SPTableContent.h"
-#import "SPConstants.h"
#import "SPConnectionController.h"
#define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]")
diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m
index 886fe1e8..41ca1b65 100644
--- a/Source/SPCopyTable.m
+++ b/Source/SPCopyTable.m
@@ -32,7 +32,6 @@
#import "SPTableRelations.h"
#import "SPCustomQuery.h"
#import "SPNotLoaded.h"
-#import "SPConstants.h"
#import "SPDataStorage.h"
#import "SPTextAndLinkCell.h"
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index 5fdfd026..151e2340 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -39,7 +39,6 @@
#import "SPTooltip.h"
#import "SPQueryFavoriteManager.h"
#import "SPQueryController.h"
-#import "SPConstants.h"
#import "SPEncodingPopupAccessory.h"
#import "SPDataStorage.h"
#import "SPAlertSheets.h"
diff --git a/Source/SPDataCellFormatter.m b/Source/SPDataCellFormatter.m
index 75fc009c..6c1f26fe 100644
--- a/Source/SPDataCellFormatter.m
+++ b/Source/SPDataCellFormatter.m
@@ -25,7 +25,6 @@
#import "SPDataCellFormatter.h"
#import "SPTooltip.h"
-#import "SPConstants.h"
@implementation SPDataCellFormatter
diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m
index 32d00382..a1051c8c 100644
--- a/Source/SPDataImport.m
+++ b/Source/SPDataImport.m
@@ -36,13 +36,13 @@
#import "SPStringAdditions.h"
#import "SPArrayAdditions.h"
#import "RegexKitLite.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
#import "SPFieldMapperController.h"
#import "SPMainThreadTrampoline.h"
#import "SPNotLoaded.h"
#import "SPFileHandle.h"
#import "SPEncodingPopupAccessory.h"
+
#import <UniversalDetector/UniversalDetector.h>
#define SP_FILE_READ_ERROR_STRING NSLocalizedString(@"File read error", @"File read error title (Import Dialog)")
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 4e598866..f8b74a86 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -49,12 +49,10 @@
#import "SPPreferenceController.h"
#import "SPUserManager.h"
#import "SPEncodingPopupAccessory.h"
-#import "SPConstants.h"
#import "YRKSpinningProgressIndicator.h"
#import "SPProcessListController.h"
#import "SPServerVariablesController.h"
#import "SPAlertSheets.h"
-#import "SPConstants.h"
#import "SPMainThreadTrampoline.h"
#import "SPLogger.h"
#import "SPDatabaseCopy.h"
diff --git a/Source/SPDotExporter.m b/Source/SPDotExporter.m
index 98644f32..c2e81862 100644
--- a/Source/SPDotExporter.m
+++ b/Source/SPDotExporter.m
@@ -24,7 +24,6 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPDotExporter.h"
-#import "SPConstants.h"
#import "SPFileHandle.h"
#import "SPArrayAdditions.h"
#import "SPTableData.h"
diff --git a/Source/SPEditSheetTextView.m b/Source/SPEditSheetTextView.m
index 97d98e26..0d309f35 100644
--- a/Source/SPEditSheetTextView.m
+++ b/Source/SPEditSheetTextView.m
@@ -25,7 +25,6 @@
#import "SPEditSheetTextView.h"
#import "SPTextViewAdditions.h"
#import "SPFieldEditorController.h"
-#import "SPConstants.h"
@implementation SPEditSheetTextView
diff --git a/Source/SPExportController.h b/Source/SPExportController.h
index befde1b9..7cedc6d8 100644
--- a/Source/SPExportController.h
+++ b/Source/SPExportController.h
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import "SPConstants.h"
-
@class MCPConnection, BWAnchoredButtonBar;
/**
diff --git a/Source/SPExportController.m b/Source/SPExportController.m
index 55a5bbc8..1e489254 100644
--- a/Source/SPExportController.m
+++ b/Source/SPExportController.m
@@ -32,7 +32,6 @@
#import "SPTableContent.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
-#import "SPConstants.h"
#import "SPGrowlController.h"
#import "SPExportFile.h"
#import "SPAlertSheets.h"
diff --git a/Source/SPExportFile.h b/Source/SPExportFile.h
index 946f6aec..38f60429 100644
--- a/Source/SPExportFile.h
+++ b/Source/SPExportFile.h
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import "SPConstants.h"
-
@class SPFileHandle;
/**
diff --git a/Source/SPExporter.h b/Source/SPExporter.h
index 5c5e68c1..abc880a0 100644
--- a/Source/SPExporter.h
+++ b/Source/SPExporter.h
@@ -48,8 +48,6 @@
* explicity called.
*/
-#import "SPConstants.h"
-
@class MCPConnection, SPExportFile;
@interface SPExporter : NSOperation
diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m
index 64e9357e..b46bbea4 100644
--- a/Source/SPExtendedTableInfo.m
+++ b/Source/SPExtendedTableInfo.m
@@ -28,7 +28,6 @@
#import "RegexKitLite.h"
#import "SPDatabaseData.h"
#import "SPStringAdditions.h"
-#import "SPConstants.h"
#import "SPDatabaseDocument.h"
#import "SPTablesList.h"
#import "SPAlertSheets.h"
diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m
index 003ab9cb..1a6e4852 100644
--- a/Source/SPFieldEditorController.m
+++ b/Source/SPFieldEditorController.m
@@ -32,7 +32,6 @@
#import "RegexKitLite.h"
#import "SPDataCellFormatter.h"
#import "SPTooltip.h"
-#import "SPConstants.h"
#import "SPGeometryDataView.h"
@implementation SPFieldEditorController
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 171155d7..4bed32a4 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -28,7 +28,6 @@
#import "SPTablesList.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
-#import "SPConstants.h"
#import "SPNotLoaded.h"
#import "SPTextView.h"
diff --git a/Source/SPFileHandle.h b/Source/SPFileHandle.h
index 1bd2ef81..b20d6548 100644
--- a/Source/SPFileHandle.h
+++ b/Source/SPFileHandle.h
@@ -24,15 +24,14 @@
// More info at <http://code.google.com/p/sequel-pro/>
/**
+ * @class SPFileHandle SPFileHandle.h
+ *
+ * @author Rowan Beentje
+ *
* Provides a class which aims to duplicate some of the most-used functionality
* of NSFileHandle, while also transparently supporting gzip and bzip2 compressed content
* on reading; gzip and bzip2 compression is also supported on writing.
*/
-
-#import <Cocoa/Cocoa.h>
-
-#import "SPConstants.h"
-
@interface SPFileHandle : NSObject
{
void *wrappedFile;
diff --git a/Source/SPGrowlController.m b/Source/SPGrowlController.m
index 8a1f60d3..d61ffd1f 100644
--- a/Source/SPGrowlController.m
+++ b/Source/SPGrowlController.m
@@ -24,7 +24,6 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPGrowlController.h"
-#import "SPConstants.h"
#import "SPMainThreadTrampoline.h"
#include <mach/mach_time.h>
diff --git a/Source/SPHistoryController.m b/Source/SPHistoryController.m
index 8478c6b4..6ef82d83 100644
--- a/Source/SPHistoryController.m
+++ b/Source/SPHistoryController.m
@@ -25,7 +25,6 @@
#import "SPDatabaseDocument.h"
#import "SPTableContent.h"
#import "SPTablesList.h"
-#import "SPConstants.h"
#import "SPHistoryController.h"
#import "SPStringAdditions.h"
#import "SPMainThreadTrampoline.h"
diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m
index 2bfa527b..70796575 100644
--- a/Source/SPIndexesController.m
+++ b/Source/SPIndexesController.m
@@ -24,7 +24,6 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPIndexesController.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
#import "SPServerSupport.h"
diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m
index 05642c87..9f6e7abb 100644
--- a/Source/SPNarrowDownCompletion.m
+++ b/Source/SPNarrowDownCompletion.m
@@ -33,12 +33,9 @@
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
#import "ImageAndTextCell.h"
-#import "SPConstants.h"
#import "SPQueryController.h"
#import "RegexKitLite.h"
#import "SPTextView.h"
-#import "SPConstants.h"
-
@interface NSTableView (MovingSelectedRow)
diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m
index 5ffac179..86a31fd5 100644
--- a/Source/SPNavigatorController.m
+++ b/Source/SPNavigatorController.m
@@ -25,7 +25,6 @@
#import "SPNavigatorController.h"
#import "RegexKitLite.h"
#import "SPNavigatorOutlineView.h"
-#import "SPConstants.h"
#import "ImageAndTextCell.h"
#import "SPDatabaseDocument.h"
#import "SPTablesList.h"
diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h
index 9f85ecc1..d7b6e8a6 100644
--- a/Source/SPPreferenceController.h
+++ b/Source/SPPreferenceController.h
@@ -23,10 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Cocoa/Cocoa.h>
-
-#import "SPConstants.h"
-
@class BWAnchoredButtonBar, SPKeychain;
@interface SPPreferenceController : NSWindowController
diff --git a/Source/SPPrintController.m b/Source/SPPrintController.m
index 29cccc66..6f6a4ce8 100644
--- a/Source/SPPrintController.m
+++ b/Source/SPPrintController.m
@@ -27,7 +27,6 @@
#import "SPTableContent.h"
#import "SPTableStructure.h"
#import "SPCustomQuery.h"
-#import "SPConstants.h"
#import "SPTableRelations.h"
#import "SPPrintAccessory.h"
#import "MGTemplateEngine.h"
diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m
index 961e983c..378a7538 100644
--- a/Source/SPProcessListController.m
+++ b/Source/SPProcessListController.m
@@ -26,7 +26,6 @@
#import "SPProcessListController.h"
#import "SPArrayAdditions.h"
#import "SPDatabaseDocument.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
#define TABLEVIEW_ID_COLUMN_IDENTIFIER @"Id"
diff --git a/Source/SPQueryController.m b/Source/SPQueryController.m
index ec7e6b70..73ba97ed 100644
--- a/Source/SPQueryController.m
+++ b/Source/SPQueryController.m
@@ -26,7 +26,6 @@
#import "SPQueryController.h"
#import "SPConsoleMessage.h"
#import "SPArrayAdditions.h"
-#import "SPConstants.h"
#import "SPCustomQuery.h"
#import "pthread.h"
diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index bab73f55..cffb5553 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -27,7 +27,6 @@
#import "ImageAndTextCell.h"
#import "SPEncodingPopupAccessory.h"
#import "SPQueryController.h"
-#import "SPConstants.h"
#import "SPConnectionController.h"
#import "RegexKitLite.h"
#import "SPTextView.h"
diff --git a/Source/SPSQLExporter.h b/Source/SPSQLExporter.h
index 58203feb..c554a51f 100644
--- a/Source/SPSQLExporter.h
+++ b/Source/SPSQLExporter.h
@@ -24,7 +24,6 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPExporter.h"
-#import "SPConstants.h"
#import "SPSQLExporterProtocol.h"
@class SPTableData;
diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m
index 993b2753..78966b36 100644
--- a/Source/SPSQLExporter.m
+++ b/Source/SPSQLExporter.m
@@ -27,7 +27,6 @@
#import "SPSQLExporter.h"
#import "SPTablesList.h"
-#import "SPConstants.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
#import "SPFileHandle.h"
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m
index fd0fcb9b..01ce909c 100644
--- a/Source/SPSSHTunnel.m
+++ b/Source/SPSSHTunnel.m
@@ -26,7 +26,6 @@
#import "SPSSHTunnel.h"
#import "RegexKitLite.h"
#import "SPKeychain.h"
-#import "SPConstants.h"
#import "SPMainThreadTrampoline.h"
#import "SPAlertSheets.h"
diff --git a/Source/SPServerVariablesController.m b/Source/SPServerVariablesController.m
index 31a29477..3bda2077 100644
--- a/Source/SPServerVariablesController.m
+++ b/Source/SPServerVariablesController.m
@@ -26,7 +26,6 @@
#import "SPServerVariablesController.h"
#import "SPArrayAdditions.h"
#import "SPDatabaseDocument.h"
-#import "SPConstants.h"
@interface SPServerVariablesController (PrivateAPI)
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index 78c1d3b4..e9a496ae 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -46,7 +46,6 @@
#import "RegexKitLite.h"
#import "SPContentFilterManager.h"
#import "SPNotLoaded.h"
-#import "SPConstants.h"
#import "SPDataStorage.h"
#import "SPAlertSheets.h"
#import "SPMainThreadTrampoline.h"
diff --git a/Source/SPTableData.m b/Source/SPTableData.m
index d3e01471..8a253854 100644
--- a/Source/SPTableData.m
+++ b/Source/SPTableData.m
@@ -29,7 +29,6 @@
#import "SPTablesList.h"
#import "SPStringAdditions.h"
#import "SPArrayAdditions.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
#import "RegexKitLite.h"
#import "SPServerSupport.h"
diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m
index 61a0bb2c..68cc1ae3 100644
--- a/Source/SPTableInfo.m
+++ b/Source/SPTableInfo.m
@@ -27,7 +27,6 @@
#import "SPDatabaseDocument.h"
#import "SPTablesList.h"
#import "SPTableData.h"
-#import "SPConstants.h"
#import "SPStringAdditions.h"
@interface SPTableInfo (PrivateAPI)
diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m
index ce8b7829..138ec35c 100644
--- a/Source/SPTableRelations.m
+++ b/Source/SPTableRelations.m
@@ -28,7 +28,6 @@
#import "SPTablesList.h"
#import "SPTableData.h"
#import "SPStringAdditions.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
@interface SPTableRelations (PrivateAPI)
diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index 55309cb1..502051a7 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -31,7 +31,6 @@
#import "SPSQLParser.h"
#import "SPStringAdditions.h"
#import "SPArrayAdditions.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
#import "SPMainThreadTrampoline.h"
#import "SPIndexesController.h"
diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m
index 329b0f8c..dc67e76a 100644
--- a/Source/SPTableTriggers.m
+++ b/Source/SPTableTriggers.m
@@ -28,7 +28,6 @@
#import "SPTablesList.h"
#import "SPTableData.h"
#import "SPStringAdditions.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
#import "SPServerSupport.h"
diff --git a/Source/SPTableView.m b/Source/SPTableView.m
index b662d417..531e3041 100644
--- a/Source/SPTableView.m
+++ b/Source/SPTableView.m
@@ -26,7 +26,6 @@
#import "SPQueryFavoriteManager.h"
#import "SPArrayAdditions.h"
#import "SPDatabaseDocument.h"
-#import "SPConstants.h"
@implementation SPTableView
diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m
index 965ddf8e..67e650b1 100644
--- a/Source/SPTablesList.m
+++ b/Source/SPTablesList.m
@@ -37,7 +37,6 @@
#import "SPDatabaseData.h"
#import "NSMutableArray-MultipleSort.h"
#import "NSNotificationAdditions.h"
-#import "SPConstants.h"
#import "SPAlertSheets.h"
#import "SPNavigatorController.h"
#import "SPMainThreadTrampoline.h"
diff --git a/Source/SPTextAndLinkCell.m b/Source/SPTextAndLinkCell.m
index 194f0e61..c0455fb1 100644
--- a/Source/SPTextAndLinkCell.m
+++ b/Source/SPTextAndLinkCell.m
@@ -24,7 +24,6 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPTextAndLinkCell.h"
-#import "SPConstants.h"
@implementation SPTextAndLinkCell
diff --git a/Source/SPTextView.m b/Source/SPTextView.m
index 32f97c15..e913df51 100644
--- a/Source/SPTextView.m
+++ b/Source/SPTextView.m
@@ -29,7 +29,6 @@
#import "SPArrayAdditions.h"
#import "SPTextViewAdditions.h"
#import "SPNarrowDownCompletion.h"
-#import "SPConstants.h"
#import "SPQueryController.h"
#import "SPTooltip.h"
#import "SPTablesList.h"
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m
index 3e561682..2789ad87 100644
--- a/Source/SPTextViewAdditions.m
+++ b/Source/SPTextViewAdditions.m
@@ -24,7 +24,6 @@
#import "SPStringAdditions.h"
#import "SPTextViewAdditions.h"
-#import "SPConstants.h"
@implementation NSTextView (SPTextViewAdditions)
diff --git a/Source/SPWindowController.m b/Source/SPWindowController.m
index 23346af3..22b7c13d 100644
--- a/Source/SPWindowController.m
+++ b/Source/SPWindowController.m
@@ -23,11 +23,11 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPWindowController.h"
-#import "SPConstants.h"
#import "SPDatabaseDocument.h"
+#import "PSMTabDragAssistant.h"
+
#import <PSMTabBar/PSMTabBarControl.h>
#import <PSMTabBar/PSMTabStyle.h>
-#import "PSMTabDragAssistant.h"
@interface SPWindowController (PrivateAPI)
diff --git a/Source/SPXMLExporter.m b/Source/SPXMLExporter.m
index 4d776f55..1e2782b1 100644
--- a/Source/SPXMLExporter.m
+++ b/Source/SPXMLExporter.m
@@ -29,7 +29,6 @@
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
#import "SPFileHandle.h"
-#import "SPConstants.h"
#import "SPExportUtilities.h"
@implementation SPXMLExporter
diff --git a/Source/Sequel-Pro.pch b/Source/Sequel-Pro.pch
index f3821249..a13ad20f 100644
--- a/Source/Sequel-Pro.pch
+++ b/Source/Sequel-Pro.pch
@@ -1,7 +1,30 @@
//
-// Prefix header for all source files of the 'sequel-pro' target in the 'sequel-pro' project.
+// $Id$
//
+// Sequel-Pro.pch
+// sequel-pro
+//
+// Copyright (c) 2010 Sequel Pro Team. All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// More info at <http://code.google.com/p/sequel-pro/>
#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
+
+ // Nearly every class uses constants
+ #import "SPConstants.h"
#endif
diff --git a/Source/SequelProTunnelAssistant.m b/Source/SequelProTunnelAssistant.m
index e6b78b81..bbf21a3c 100644
--- a/Source/SequelProTunnelAssistant.m
+++ b/Source/SequelProTunnelAssistant.m
@@ -26,8 +26,8 @@
#import "SPKeychain.h"
#import "SPSSHTunnel.h"
-#import "SPConstants.h"
#import "RegexKitLite.h"
+#import "SPConstants.h"
int main(int argc, const char *argv[])
{