diff --git a/ToneHelper.h b/JFTHHeaders.h
similarity index 100%
rename from ToneHelper.h
rename to JFTHHeaders.h
diff --git a/JFTHRingtoneDataController.h b/JFTHRingtoneDataController.h
index 46dd189..f253470 100644
--- a/JFTHRingtoneDataController.h
+++ b/JFTHRingtoneDataController.h
@@ -1,5 +1,6 @@
 
-#import <Foundation/Foundation.h>
+#import "JFTHHeaders.h"
+#import "JFTHRingtoneImporter.h"
 
 
 typedef NS_ENUM(NSInteger, JFTHRingtoneParameterType) {
diff --git a/JFTHRingtoneDataController.m b/JFTHRingtoneDataController.m
index fb86bd3..0dd242e 100644
--- a/JFTHRingtoneDataController.m
+++ b/JFTHRingtoneDataController.m
@@ -1,5 +1,4 @@
 #import "JFTHRingtoneDataController.h"
-#import "JFTHRingtoneImporter.h"
 
 NSString * const RINGTONE_PLIST_PATH = @"/var/mobile/Media/iTunes_Control/iTunes/Ringtones.plist";
 NSString * const TONEHELPERDATA_PLIST_PATH = @"/var/mobile/Library/Application Support/ToneHelper/ToneHelperData.plist";
diff --git a/JFTHRingtoneImporter.h b/JFTHRingtoneImporter.h
index 7789601..ec8787f 100644
--- a/JFTHRingtoneImporter.h
+++ b/JFTHRingtoneImporter.h
@@ -1,7 +1,11 @@
-#import "ToneHelper.h"
+#import "JFTHHeaders.h"
 #import "JFTHRingtoneDataController.h"
+
+//For md5 calculations
 #include "FileHash.h"
 
+@class JFTHRingtoneDataController;
+
 @interface JFTHRingtoneImporter : NSObject {
     
     NSMutableDictionary *ringtonesToImport;
diff --git a/Tweak.xm b/Tweak.xm
index 6ba8819..2ae355d 100644
--- a/Tweak.xm
+++ b/Tweak.xm
@@ -1,4 +1,4 @@
-#import "ToneHelper.h"
+#import "JFTHHeaders.h"
 #import "JFTHRingtoneImporter.h"
 
 #import <objc/runtime.h>
diff --git a/layout/DEBIAN/control b/layout/DEBIAN/control
index deae409..892207b 100755
--- a/layout/DEBIAN/control
+++ b/layout/DEBIAN/control
@@ -1,7 +1,7 @@
 Package: fi.flodin.tonehelper
 Name: ToneHelper
 Depends: mobilesubstrate, ws.hbang.common (>= 1.12)
-Version: 0.2.7
+Version: 0.2.8
 Architecture: iphoneos-arm
 Description: Automatically adds ringtones from Audiko to device
 Maintainer: Jesper Flodin <jesper@flodin.fi>
diff --git a/thprefsbundle/JFTHPrefHeaders.h b/thprefsbundle/JFTHPrefHeaders.h
new file mode 100644
index 0000000..519f8e6
--- /dev/null
+++ b/thprefsbundle/JFTHPrefHeaders.h
@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <Preferences/PSListController.h>
+#import <Preferences/PSSpecifier.h>
+
+//libcephei prefs headers we need 
+#import <CepheiPrefs/HBTintedTableCell.h>
+#import <CepheiPrefs/HBRootListController.h>
+#import <CepheiPrefs/HBLinkTableCell.h>
+#import <CepheiPrefs/HBTwitterCell.h>
+#import <CepheiPrefs/HBImageTableCell.h>
+#import <CepheiPrefs/HBPackageNameHeaderCell.h>
+#import <CepheiPrefs/HBSupportController.h>
+
+#import <SafariServices/SFSafariViewController.h>
+#import <TechSupport/TechSupport.h>
+
+#import "../Log.h"
+
+@interface NSTask : NSObject
+
+- (id)init;
+- (void)launch;
+- (void)setArguments:(id)arg1;
+- (void)setLaunchPath:(id)arg1;
+- (void)setStandardOutput:(id)arg1;
+- (id)standardOutput;
+
+@end
+
+@interface PSEditableListController : PSListController
+@end
diff --git a/thprefsbundle/JFTHRingtoneListController.h b/thprefsbundle/JFTHRingtoneListController.h
index b905b63..fc53ab4 100644
--- a/thprefsbundle/JFTHRingtoneListController.h
+++ b/thprefsbundle/JFTHRingtoneListController.h
@@ -1,14 +1,9 @@
 //libcephei prefs headers we need 
 //#import <CepheiPrefs/HBListController.h>
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <Preferences/PSListController.h>
-#import <Preferences/PSSpecifier.h>
+#import "JFTHPrefHeaders.h"
+
 #import "../JFTHRingtoneDataController.h"
-#import "../Log.h"
 
-@interface PSEditableListController : PSListController
-@end
 @interface JFTHRingtoneListController : PSEditableListController {
     JFTHRingtoneDataController *_toneData;
 }
diff --git a/thprefsbundle/JFTHRootListController.h b/thprefsbundle/JFTHRootListController.h
index b8164da..b9af9f0 100644
--- a/thprefsbundle/JFTHRootListController.h
+++ b/thprefsbundle/JFTHRootListController.h
@@ -1,19 +1,4 @@
-//libcephei prefs headers we need 
-#import <CepheiPrefs/HBTintedTableCell.h>
-#import <CepheiPrefs/HBRootListController.h>
-#import <CepheiPrefs/HBLinkTableCell.h>
-#import <CepheiPrefs/HBTwitterCell.h>
-#import <CepheiPrefs/HBImageTableCell.h>
-#import <CepheiPrefs/HBPackageNameHeaderCell.h>
-#import <CepheiPrefs/HBSupportController.h>
-
-#import <SafariServices/SFSafariViewController.h>
-
-#import <Preferences/PSSpecifier.h>
-
-#import <TechSupport/TechSupport.h>
-
-#import "../Log.h"
+#import "JFTHPrefHeaders.h"
 
 @class TSIncludeInstruction;
 
@@ -32,13 +17,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-@interface NSTask : NSObject
-
-- (id)init;
-- (void)launch;
-- (void)setArguments:(id)arg1;
-- (void)setLaunchPath:(id)arg1;
-- (void)setStandardOutput:(id)arg1;
-- (id)standardOutput;
 
-@end