diff --git a/Charts/Classes/Data/Implementations/Standard/ScatterChartDataSet.swift b/Charts/Classes/Data/Implementations/Standard/ScatterChartDataSet.swift
index 791c71ec28..0333cea03a 100644
--- a/Charts/Classes/Data/Implementations/Standard/ScatterChartDataSet.swift
+++ b/Charts/Classes/Data/Implementations/Standard/ScatterChartDataSet.swift
@@ -13,6 +13,7 @@
 
 import Foundation
 import CoreGraphics
+import UIKit
 
 public class ScatterChartDataSet: LineScatterCandleRadarChartDataSet, IScatterChartDataSet
 {
diff --git a/Charts/Classes/Data/Interfaces/IBarChartDataSet.swift b/Charts/Classes/Data/Interfaces/IBarChartDataSet.swift
index b6449671d5..be530a621a 100644
--- a/Charts/Classes/Data/Interfaces/IBarChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/IBarChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol IBarChartDataSet: IBarLineScatterCandleBubbleChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/IBarLineScatterCandleBubbleChartDataSet.swift b/Charts/Classes/Data/Interfaces/IBarLineScatterCandleBubbleChartDataSet.swift
index 3165fcf8d6..d1621d3169 100644
--- a/Charts/Classes/Data/Interfaces/IBarLineScatterCandleBubbleChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/IBarLineScatterCandleBubbleChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol IBarLineScatterCandleBubbleChartDataSet: IChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/IBubbleChartDataSet.swift b/Charts/Classes/Data/Interfaces/IBubbleChartDataSet.swift
index 21fd67efab..3ecf2eb24b 100644
--- a/Charts/Classes/Data/Interfaces/IBubbleChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/IBubbleChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol IBubbleChartDataSet: IBarLineScatterCandleBubbleChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/ICandleChartDataSet.swift b/Charts/Classes/Data/Interfaces/ICandleChartDataSet.swift
index 43ae6ca439..b6db7553e5 100644
--- a/Charts/Classes/Data/Interfaces/ICandleChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/ICandleChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol ICandleChartDataSet: ILineScatterCandleRadarChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/IChartDataSet.swift b/Charts/Classes/Data/Interfaces/IChartDataSet.swift
index d6f8a03a82..599795cf17 100644
--- a/Charts/Classes/Data/Interfaces/IChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/IChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol IChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift b/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift
index f6fb8312f1..c65383bd0f 100644
--- a/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/ILineChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol ILineChartDataSet: ILineRadarChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/ILineRadarChartDataSet.swift b/Charts/Classes/Data/Interfaces/ILineRadarChartDataSet.swift
index 7272a45878..cf35254233 100644
--- a/Charts/Classes/Data/Interfaces/ILineRadarChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/ILineRadarChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol ILineRadarChartDataSet: ILineScatterCandleRadarChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/IPieChartDataSet.swift b/Charts/Classes/Data/Interfaces/IPieChartDataSet.swift
index cf7272b0b0..f023dafa14 100644
--- a/Charts/Classes/Data/Interfaces/IPieChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/IPieChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol IPieChartDataSet: IChartDataSet
diff --git a/Charts/Classes/Data/Interfaces/IScatterChartDataSet.swift b/Charts/Classes/Data/Interfaces/IScatterChartDataSet.swift
index 4ef0d17383..0d190e6cd6 100644
--- a/Charts/Classes/Data/Interfaces/IScatterChartDataSet.swift
+++ b/Charts/Classes/Data/Interfaces/IScatterChartDataSet.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc
 public protocol IScatterChartDataSet: ILineScatterCandleRadarChartDataSet
diff --git a/Charts/Classes/Formatters/ChartDefaultFillFormatter.swift b/Charts/Classes/Formatters/ChartDefaultFillFormatter.swift
index fd1c67a97b..6af1a67c84 100644
--- a/Charts/Classes/Formatters/ChartDefaultFillFormatter.swift
+++ b/Charts/Classes/Formatters/ChartDefaultFillFormatter.swift
@@ -12,6 +12,7 @@
 //
 
 import Foundation
+import UIKit
 
 /// Default formatter that calculates the position of the filled line.
 public class ChartDefaultFillFormatter: NSObject, ChartFillFormatter
diff --git a/Charts/Classes/Jobs/AnimatedMoveViewJob.swift b/Charts/Classes/Jobs/AnimatedMoveViewJob.swift
index da9abefe61..1494cc363c 100644
--- a/Charts/Classes/Jobs/AnimatedMoveViewJob.swift
+++ b/Charts/Classes/Jobs/AnimatedMoveViewJob.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import UIKit
 
 public class AnimatedMoveChartViewJob: AnimatedViewPortJob
 {
diff --git a/Charts/Classes/Jobs/AnimatedViewPortJob.swift b/Charts/Classes/Jobs/AnimatedViewPortJob.swift
index b2995c09a0..4952132faf 100644
--- a/Charts/Classes/Jobs/AnimatedViewPortJob.swift
+++ b/Charts/Classes/Jobs/AnimatedViewPortJob.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import UIKit
 
 public class AnimatedViewPortJob: ChartViewPortJob
 {
diff --git a/Charts/Classes/Jobs/AnimatedZoomViewJob.swift b/Charts/Classes/Jobs/AnimatedZoomViewJob.swift
index 542c8fb453..16e7e1c9d7 100644
--- a/Charts/Classes/Jobs/AnimatedZoomViewJob.swift
+++ b/Charts/Classes/Jobs/AnimatedZoomViewJob.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import UIKit
 
 public class AnimatedZoomChartViewJob: AnimatedViewPortJob
 {
diff --git a/Charts/Classes/Jobs/ChartViewPortJob.swift b/Charts/Classes/Jobs/ChartViewPortJob.swift
index 96e609fd95..455d054526 100644
--- a/Charts/Classes/Jobs/ChartViewPortJob.swift
+++ b/Charts/Classes/Jobs/ChartViewPortJob.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import UIKit
 
 // This defines a viewport modification job, used for delaying or animating viewport changes
 public class ChartViewPortJob
diff --git a/Charts/Classes/Jobs/MoveChartViewJob.swift b/Charts/Classes/Jobs/MoveChartViewJob.swift
index 3f5718a617..11efbc835a 100644
--- a/Charts/Classes/Jobs/MoveChartViewJob.swift
+++ b/Charts/Classes/Jobs/MoveChartViewJob.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import UIKit
 
 public class MoveChartViewJob: ChartViewPortJob
 {
diff --git a/Charts/Classes/Jobs/ZoomChartViewJob.swift b/Charts/Classes/Jobs/ZoomChartViewJob.swift
index db30f6d73d..2554768b4a 100644
--- a/Charts/Classes/Jobs/ZoomChartViewJob.swift
+++ b/Charts/Classes/Jobs/ZoomChartViewJob.swift
@@ -10,6 +10,7 @@
 //
 
 import Foundation
+import UIKit
 
 public class ZoomChartViewJob: ChartViewPortJob
 {
diff --git a/Charts/Classes/Utils/ChartFill.swift b/Charts/Classes/Utils/ChartFill.swift
index fb00786c11..50caeab612 100644
--- a/Charts/Classes/Utils/ChartFill.swift
+++ b/Charts/Classes/Utils/ChartFill.swift
@@ -13,6 +13,7 @@
 //
 
 import Foundation
+import UIKit
 
 public class ChartFill: NSObject
 {