diff --git a/src/@ionic-native/plugins/3dtouch/index.ts b/src/@ionic-native/plugins/3dtouch/index.ts
index 20e89e4e3..f2f0df109 100644
--- a/src/@ionic-native/plugins/3dtouch/index.ts
+++ b/src/@ionic-native/plugins/3dtouch/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/actionsheet/index.ts b/src/@ionic-native/plugins/actionsheet/index.ts
index a1f2eb594..2806af33c 100644
--- a/src/@ionic-native/plugins/actionsheet/index.ts
+++ b/src/@ionic-native/plugins/actionsheet/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/admob/index.ts b/src/@ionic-native/plugins/admob/index.ts
index 18b6155ec..074427385 100644
--- a/src/@ionic-native/plugins/admob/index.ts
+++ b/src/@ionic-native/plugins/admob/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/android-fingerprint-auth/index.ts b/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
index c442f3204..c80820fc7 100644
--- a/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
+++ b/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/appavailability/index.ts b/src/@ionic-native/plugins/appavailability/index.ts
index c02deb199..720cb2643 100644
--- a/src/@ionic-native/plugins/appavailability/index.ts
+++ b/src/@ionic-native/plugins/appavailability/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/apprate/index.ts b/src/@ionic-native/plugins/apprate/index.ts
index c42b1711f..b54bdf8d9 100644
--- a/src/@ionic-native/plugins/apprate/index.ts
+++ b/src/@ionic-native/plugins/apprate/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, CordovaProperty, Plugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
diff --git a/src/@ionic-native/plugins/appversion/index.ts b/src/@ionic-native/plugins/appversion/index.ts
index 2d210f252..eb407e326 100644
--- a/src/@ionic-native/plugins/appversion/index.ts
+++ b/src/@ionic-native/plugins/appversion/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/background-geolocation/index.ts b/src/@ionic-native/plugins/background-geolocation/index.ts
index 5f7c1d405..1fcab59bf 100644
--- a/src/@ionic-native/plugins/background-geolocation/index.ts
+++ b/src/@ionic-native/plugins/background-geolocation/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import {Cordova, Plugin} from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
diff --git a/src/@ionic-native/plugins/backgroundmode/index.ts b/src/@ionic-native/plugins/backgroundmode/index.ts
index cd3465c33..d6cb53590 100644
--- a/src/@ionic-native/plugins/backgroundmode/index.ts
+++ b/src/@ionic-native/plugins/backgroundmode/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, CordovaFunctionOverride, Plugin } from '@ionic-native/core';
 
 import { Observable } from 'rxjs/Observable';
diff --git a/src/@ionic-native/plugins/backlight/index.ts b/src/@ionic-native/plugins/backlight/index.ts
index cffd5558b..d53102fd6 100644
--- a/src/@ionic-native/plugins/backlight/index.ts
+++ b/src/@ionic-native/plugins/backlight/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
diff --git a/src/@ionic-native/plugins/badge/index.ts b/src/@ionic-native/plugins/badge/index.ts
index 9961de15b..75ea26d31 100644
--- a/src/@ionic-native/plugins/badge/index.ts
+++ b/src/@ionic-native/plugins/badge/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
diff --git a/src/@ionic-native/plugins/barcodescanner/index.ts b/src/@ionic-native/plugins/barcodescanner/index.ts
index a88e1d2fd..24f576a9c 100644
--- a/src/@ionic-native/plugins/barcodescanner/index.ts
+++ b/src/@ionic-native/plugins/barcodescanner/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
diff --git a/src/@ionic-native/plugins/base64togallery/index.ts b/src/@ionic-native/plugins/base64togallery/index.ts
index e9041348c..73c014e7a 100644
--- a/src/@ionic-native/plugins/base64togallery/index.ts
+++ b/src/@ionic-native/plugins/base64togallery/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/batterystatus/index.ts b/src/@ionic-native/plugins/batterystatus/index.ts
index d3587a939..84defec5c 100644
--- a/src/@ionic-native/plugins/batterystatus/index.ts
+++ b/src/@ionic-native/plugins/batterystatus/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/ble/index.ts b/src/@ionic-native/plugins/ble/index.ts
index 4dbc3f8c3..74571319f 100644
--- a/src/@ionic-native/plugins/ble/index.ts
+++ b/src/@ionic-native/plugins/ble/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/bluetoothserial/index.ts b/src/@ionic-native/plugins/bluetoothserial/index.ts
index b3d684075..9fd45bc00 100644
--- a/src/@ionic-native/plugins/bluetoothserial/index.ts
+++ b/src/@ionic-native/plugins/bluetoothserial/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/brightness/index.ts b/src/@ionic-native/plugins/brightness/index.ts
index 64a4a4613..9959557ca 100644
--- a/src/@ionic-native/plugins/brightness/index.ts
+++ b/src/@ionic-native/plugins/brightness/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/broadcaster/index.ts b/src/@ionic-native/plugins/broadcaster/index.ts
index d61ac3e46..f328b9693 100644
--- a/src/@ionic-native/plugins/broadcaster/index.ts
+++ b/src/@ionic-native/plugins/broadcaster/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/calendar/index.ts b/src/@ionic-native/plugins/calendar/index.ts
index 832db2b72..2c8c22c23 100644
--- a/src/@ionic-native/plugins/calendar/index.ts
+++ b/src/@ionic-native/plugins/calendar/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/call-number/index.ts b/src/@ionic-native/plugins/call-number/index.ts
index c5e39e125..1cf825d38 100644
--- a/src/@ionic-native/plugins/call-number/index.ts
+++ b/src/@ionic-native/plugins/call-number/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 /**
diff --git a/src/@ionic-native/plugins/camera-preview/index.ts b/src/@ionic-native/plugins/camera-preview/index.ts
index ffe055af8..582eb97c2 100644
--- a/src/@ionic-native/plugins/camera-preview/index.ts
+++ b/src/@ionic-native/plugins/camera-preview/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/camera/index.ts b/src/@ionic-native/plugins/camera/index.ts
index 3c7f70ec0..59593db86 100644
--- a/src/@ionic-native/plugins/camera/index.ts
+++ b/src/@ionic-native/plugins/camera/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
diff --git a/src/@ionic-native/plugins/card-io/index.ts b/src/@ionic-native/plugins/card-io/index.ts
index 974aedfab..b740e464c 100644
--- a/src/@ionic-native/plugins/card-io/index.ts
+++ b/src/@ionic-native/plugins/card-io/index.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/clipboard/index.ts b/src/@ionic-native/plugins/clipboard/index.ts
index 298b4fd9b..0e4a12057 100644
--- a/src/@ionic-native/plugins/clipboard/index.ts
+++ b/src/@ionic-native/plugins/clipboard/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 /**
diff --git a/src/@ionic-native/plugins/code-push/index.ts b/src/@ionic-native/plugins/code-push/index.ts
index 624ca42b8..e3aaac08a 100644
--- a/src/@ionic-native/plugins/code-push/index.ts
+++ b/src/@ionic-native/plugins/code-push/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Injectable } from '@angular/core';
diff --git a/src/@ionic-native/plugins/contacts/index.ts b/src/@ionic-native/plugins/contacts/index.ts
index 2155d836c..c9e6ef89d 100644
--- a/src/@ionic-native/plugins/contacts/index.ts
+++ b/src/@ionic-native/plugins/contacts/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { CordovaInstance, InstanceProperty, Plugin, getPromise } from '@ionic-native/core';
 
 declare var window: any,
diff --git a/src/@ionic-native/plugins/crop/index.ts b/src/@ionic-native/plugins/crop/index.ts
index c2dad4f5b..2e21683f0 100644
--- a/src/@ionic-native/plugins/crop/index.ts
+++ b/src/@ionic-native/plugins/crop/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/datepicker/index.ts b/src/@ionic-native/plugins/datepicker/index.ts
index 6b8ba0e3d..8c4825fb7 100644
--- a/src/@ionic-native/plugins/datepicker/index.ts
+++ b/src/@ionic-native/plugins/datepicker/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import {Cordova, Plugin} from '@ionic-native/core';
 
 export interface DatePickerOptions {
diff --git a/src/@ionic-native/plugins/dbmeter/index.ts b/src/@ionic-native/plugins/dbmeter/index.ts
index b6d88d19e..be4b5f037 100644
--- a/src/@ionic-native/plugins/dbmeter/index.ts
+++ b/src/@ionic-native/plugins/dbmeter/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/deeplinks/index.ts b/src/@ionic-native/plugins/deeplinks/index.ts
index f6c7eb635..de4f20c6c 100644
--- a/src/@ionic-native/plugins/deeplinks/index.ts
+++ b/src/@ionic-native/plugins/deeplinks/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/device-feedback/index.ts b/src/@ionic-native/plugins/device-feedback/index.ts
index ac8f0d003..7a6d9d3e7 100644
--- a/src/@ionic-native/plugins/device-feedback/index.ts
+++ b/src/@ionic-native/plugins/device-feedback/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name DeviceFeedback
diff --git a/src/@ionic-native/plugins/device/index.ts b/src/@ionic-native/plugins/device/index.ts
index 773084884..23d98d730 100644
--- a/src/@ionic-native/plugins/device/index.ts
+++ b/src/@ionic-native/plugins/device/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { CordovaProperty, Plugin } from '@ionic-native/core';
 
 declare var window: any;
diff --git a/src/@ionic-native/plugins/deviceaccounts/index.ts b/src/@ionic-native/plugins/deviceaccounts/index.ts
index 494131116..2a0530bfa 100644
--- a/src/@ionic-native/plugins/deviceaccounts/index.ts
+++ b/src/@ionic-native/plugins/deviceaccounts/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 @Plugin({
diff --git a/src/@ionic-native/plugins/devicemotion/index.ts b/src/@ionic-native/plugins/devicemotion/index.ts
index af8c5ecda..53b3ea7a2 100644
--- a/src/@ionic-native/plugins/devicemotion/index.ts
+++ b/src/@ionic-native/plugins/devicemotion/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/deviceorientation/index.ts b/src/@ionic-native/plugins/deviceorientation/index.ts
index ff83b94ab..cf684383c 100644
--- a/src/@ionic-native/plugins/deviceorientation/index.ts
+++ b/src/@ionic-native/plugins/deviceorientation/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/diagnostic/index.ts b/src/@ionic-native/plugins/diagnostic/index.ts
index 2fc8aab72..6651a4b3e 100644
--- a/src/@ionic-native/plugins/diagnostic/index.ts
+++ b/src/@ionic-native/plugins/diagnostic/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import {Cordova, Plugin, CordovaProperty} from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/dialogs/index.ts b/src/@ionic-native/plugins/dialogs/index.ts
index dda3daf43..9af76abbe 100644
--- a/src/@ionic-native/plugins/dialogs/index.ts
+++ b/src/@ionic-native/plugins/dialogs/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/emailcomposer/index.ts b/src/@ionic-native/plugins/emailcomposer/index.ts
index 79d77404c..6284d75dd 100644
--- a/src/@ionic-native/plugins/emailcomposer/index.ts
+++ b/src/@ionic-native/plugins/emailcomposer/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 declare var cordova: any;
diff --git a/src/@ionic-native/plugins/estimote-beacons/index.ts b/src/@ionic-native/plugins/estimote-beacons/index.ts
index 9f1456b3d..2574c5706 100644
--- a/src/@ionic-native/plugins/estimote-beacons/index.ts
+++ b/src/@ionic-native/plugins/estimote-beacons/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/facebook/index.ts b/src/@ionic-native/plugins/facebook/index.ts
index de34cbfff..92fc0311e 100644
--- a/src/@ionic-native/plugins/facebook/index.ts
+++ b/src/@ionic-native/plugins/facebook/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 export interface FacebookLoginResponse {
diff --git a/src/@ionic-native/plugins/file-chooser/index.ts b/src/@ionic-native/plugins/file-chooser/index.ts
index 527127377..fd108f77f 100644
--- a/src/@ionic-native/plugins/file-chooser/index.ts
+++ b/src/@ionic-native/plugins/file-chooser/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/file-opener/index.ts b/src/@ionic-native/plugins/file-opener/index.ts
index ef772c408..25ca82a84 100644
--- a/src/@ionic-native/plugins/file-opener/index.ts
+++ b/src/@ionic-native/plugins/file-opener/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/file/index.ts b/src/@ionic-native/plugins/file/index.ts
index 70d644ac5..ec80cb993 100644
--- a/src/@ionic-native/plugins/file/index.ts
+++ b/src/@ionic-native/plugins/file/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, pluginWarn } from '@ionic-native/core';
 
 declare var window: any;
diff --git a/src/@ionic-native/plugins/filepath/index.ts b/src/@ionic-native/plugins/filepath/index.ts
index a3ec7e1bc..e53587e40 100644
--- a/src/@ionic-native/plugins/filepath/index.ts
+++ b/src/@ionic-native/plugins/filepath/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 declare var window: any;
diff --git a/src/@ionic-native/plugins/filetransfer/index.ts b/src/@ionic-native/plugins/filetransfer/index.ts
index 4885454f6..4211389fc 100644
--- a/src/@ionic-native/plugins/filetransfer/index.ts
+++ b/src/@ionic-native/plugins/filetransfer/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { CordovaInstance, Plugin } from '@ionic-native/core';
 
 declare var FileTransfer;
diff --git a/src/@ionic-native/plugins/fingerprint-aio/index.ts b/src/@ionic-native/plugins/fingerprint-aio/index.ts
index 9ada3b12f..32bfe3560 100644
--- a/src/@ionic-native/plugins/fingerprint-aio/index.ts
+++ b/src/@ionic-native/plugins/fingerprint-aio/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/firebase/index.ts b/src/@ionic-native/plugins/firebase/index.ts
index bc4d4959c..6ebfe3153 100644
--- a/src/@ionic-native/plugins/firebase/index.ts
+++ b/src/@ionic-native/plugins/firebase/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/flashlight/index.ts b/src/@ionic-native/plugins/flashlight/index.ts
index 12340768a..708a9e67d 100644
--- a/src/@ionic-native/plugins/flashlight/index.ts
+++ b/src/@ionic-native/plugins/flashlight/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/geofence/index.ts b/src/@ionic-native/plugins/geofence/index.ts
index b224afb06..50febe001 100644
--- a/src/@ionic-native/plugins/geofence/index.ts
+++ b/src/@ionic-native/plugins/geofence/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/geolocation/index.ts b/src/@ionic-native/plugins/geolocation/index.ts
index 4920da8c8..a2b1c1676 100644
--- a/src/@ionic-native/plugins/geolocation/index.ts
+++ b/src/@ionic-native/plugins/geolocation/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/globalization/index.ts b/src/@ionic-native/plugins/globalization/index.ts
index 733b19b80..552a5c29b 100644
--- a/src/@ionic-native/plugins/globalization/index.ts
+++ b/src/@ionic-native/plugins/globalization/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/google-plus/index.ts b/src/@ionic-native/plugins/google-plus/index.ts
index f6ec16c49..8594c6f16 100644
--- a/src/@ionic-native/plugins/google-plus/index.ts
+++ b/src/@ionic-native/plugins/google-plus/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/googleanalytics/index.ts b/src/@ionic-native/plugins/googleanalytics/index.ts
index 1b901eeea..0c837126c 100644
--- a/src/@ionic-native/plugins/googleanalytics/index.ts
+++ b/src/@ionic-native/plugins/googleanalytics/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 declare var window;
diff --git a/src/@ionic-native/plugins/googlemap/index.ts b/src/@ionic-native/plugins/googlemap/index.ts
index 8f8a7d96f..8e74ece41 100644
--- a/src/@ionic-native/plugins/googlemap/index.ts
+++ b/src/@ionic-native/plugins/googlemap/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, CordovaInstance, Plugin, InstanceProperty, getPlugin, pluginWarn } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
diff --git a/src/@ionic-native/plugins/headercolor/index.ts b/src/@ionic-native/plugins/headercolor/index.ts
index 1cbe08858..2975d1d71 100644
--- a/src/@ionic-native/plugins/headercolor/index.ts
+++ b/src/@ionic-native/plugins/headercolor/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/hotspot/index.ts b/src/@ionic-native/plugins/hotspot/index.ts
index 6d32ee78c..f1d62c2c4 100644
--- a/src/@ionic-native/plugins/hotspot/index.ts
+++ b/src/@ionic-native/plugins/hotspot/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 export interface HotspotConnectionInfo {
diff --git a/src/@ionic-native/plugins/http/index.ts b/src/@ionic-native/plugins/http/index.ts
index 62c636d66..910319fd6 100644
--- a/src/@ionic-native/plugins/http/index.ts
+++ b/src/@ionic-native/plugins/http/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 export interface HTTPResponse {
diff --git a/src/@ionic-native/plugins/httpd/index.ts b/src/@ionic-native/plugins/httpd/index.ts
index 025dfed7e..4f7f8a980 100644
--- a/src/@ionic-native/plugins/httpd/index.ts
+++ b/src/@ionic-native/plugins/httpd/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/ibeacon/index.ts b/src/@ionic-native/plugins/ibeacon/index.ts
index 7bfc090e5..018d071c8 100644
--- a/src/@ionic-native/plugins/ibeacon/index.ts
+++ b/src/@ionic-native/plugins/ibeacon/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/imagepicker/index.ts b/src/@ionic-native/plugins/imagepicker/index.ts
index d0a934b30..a6ce489b4 100644
--- a/src/@ionic-native/plugins/imagepicker/index.ts
+++ b/src/@ionic-native/plugins/imagepicker/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/imageresizer/index.ts b/src/@ionic-native/plugins/imageresizer/index.ts
index 58936425d..0dccd8755 100644
--- a/src/@ionic-native/plugins/imageresizer/index.ts
+++ b/src/@ionic-native/plugins/imageresizer/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 export interface ImageResizerOptions {
diff --git a/src/@ionic-native/plugins/inappbrowser/index.ts b/src/@ionic-native/plugins/inappbrowser/index.ts
index 05a4b54a9..b3d01ee68 100644
--- a/src/@ionic-native/plugins/inappbrowser/index.ts
+++ b/src/@ionic-native/plugins/inappbrowser/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, CordovaInstance } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/inapppurchase/index.ts b/src/@ionic-native/plugins/inapppurchase/index.ts
index 79af06521..2b4bb920e 100644
--- a/src/@ionic-native/plugins/inapppurchase/index.ts
+++ b/src/@ionic-native/plugins/inapppurchase/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/insomnia/index.ts b/src/@ionic-native/plugins/insomnia/index.ts
index d1b3343bd..71be3cd04 100644
--- a/src/@ionic-native/plugins/insomnia/index.ts
+++ b/src/@ionic-native/plugins/insomnia/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/instagram/index.ts b/src/@ionic-native/plugins/instagram/index.ts
index 814ccc0df..7caef2973 100644
--- a/src/@ionic-native/plugins/instagram/index.ts
+++ b/src/@ionic-native/plugins/instagram/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/is-debug/index.ts b/src/@ionic-native/plugins/is-debug/index.ts
index 941ee0063..534ef631b 100644
--- a/src/@ionic-native/plugins/is-debug/index.ts
+++ b/src/@ionic-native/plugins/is-debug/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/keyboard/index.ts b/src/@ionic-native/plugins/keyboard/index.ts
index 20bc31592..07cf2d649 100644
--- a/src/@ionic-native/plugins/keyboard/index.ts
+++ b/src/@ionic-native/plugins/keyboard/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/launch-review/index.ts b/src/@ionic-native/plugins/launch-review/index.ts
index 16a065707..a946cff6a 100644
--- a/src/@ionic-native/plugins/launch-review/index.ts
+++ b/src/@ionic-native/plugins/launch-review/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/launchnavigator/index.ts b/src/@ionic-native/plugins/launchnavigator/index.ts
index 4d810e0b8..158989c35 100644
--- a/src/@ionic-native/plugins/launchnavigator/index.ts
+++ b/src/@ionic-native/plugins/launchnavigator/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 export interface LaunchNavigatorOptions {
diff --git a/src/@ionic-native/plugins/localnotifications/index.ts b/src/@ionic-native/plugins/localnotifications/index.ts
index c5c9734b4..a6f4c4e66 100644
--- a/src/@ionic-native/plugins/localnotifications/index.ts
+++ b/src/@ionic-native/plugins/localnotifications/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 export interface ILocalNotification {
diff --git a/src/@ionic-native/plugins/location-accuracy/index.ts b/src/@ionic-native/plugins/location-accuracy/index.ts
index 6787829c3..a49cc4503 100644
--- a/src/@ionic-native/plugins/location-accuracy/index.ts
+++ b/src/@ionic-native/plugins/location-accuracy/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import {Plugin, Cordova} from '@ionic-native/core';
 /**
  * @name LocationAccuracy
diff --git a/src/@ionic-native/plugins/market/index.ts b/src/@ionic-native/plugins/market/index.ts
index b56c19688..c480222e5 100644
--- a/src/@ionic-native/plugins/market/index.ts
+++ b/src/@ionic-native/plugins/market/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name Market
diff --git a/src/@ionic-native/plugins/media-capture/index.ts b/src/@ionic-native/plugins/media-capture/index.ts
index ebb2c38cf..4474309bb 100644
--- a/src/@ionic-native/plugins/media-capture/index.ts
+++ b/src/@ionic-native/plugins/media-capture/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, CordovaProperty, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/media/index.ts b/src/@ionic-native/plugins/media/index.ts
index 96a9da324..8d22119a1 100644
--- a/src/@ionic-native/plugins/media/index.ts
+++ b/src/@ionic-native/plugins/media/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { CordovaInstance, Plugin, getPlugin, pluginWarn } from '@ionic-native/core';
 
 declare var Media: any;
diff --git a/src/@ionic-native/plugins/mixpanel/index.ts b/src/@ionic-native/plugins/mixpanel/index.ts
index e2e61c834..d98655872 100644
--- a/src/@ionic-native/plugins/mixpanel/index.ts
+++ b/src/@ionic-native/plugins/mixpanel/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 declare var mixpanel: any;
diff --git a/src/@ionic-native/plugins/music-controls/index.ts b/src/@ionic-native/plugins/music-controls/index.ts
index d93ac9616..89a0faed2 100644
--- a/src/@ionic-native/plugins/music-controls/index.ts
+++ b/src/@ionic-native/plugins/music-controls/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/native-audio/index.ts b/src/@ionic-native/plugins/native-audio/index.ts
index 4d2d5bb8b..2c05f6881 100644
--- a/src/@ionic-native/plugins/native-audio/index.ts
+++ b/src/@ionic-native/plugins/native-audio/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name NativeAudio
diff --git a/src/@ionic-native/plugins/native-geocoder/index.ts b/src/@ionic-native/plugins/native-geocoder/index.ts
index 83dc22576..f13b03208 100644
--- a/src/@ionic-native/plugins/native-geocoder/index.ts
+++ b/src/@ionic-native/plugins/native-geocoder/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/native-page-transitions/index.ts b/src/@ionic-native/plugins/native-page-transitions/index.ts
index b08d8c709..c99977444 100644
--- a/src/@ionic-native/plugins/native-page-transitions/index.ts
+++ b/src/@ionic-native/plugins/native-page-transitions/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 export interface NativeTransitionOptions {
diff --git a/src/@ionic-native/plugins/nativestorage/index.ts b/src/@ionic-native/plugins/nativestorage/index.ts
index 0d00d7218..b2f44eb06 100644
--- a/src/@ionic-native/plugins/nativestorage/index.ts
+++ b/src/@ionic-native/plugins/nativestorage/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/navigationbar/index.ts b/src/@ionic-native/plugins/navigationbar/index.ts
index a614a5668..cfda5ba06 100644
--- a/src/@ionic-native/plugins/navigationbar/index.ts
+++ b/src/@ionic-native/plugins/navigationbar/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/network/index.ts b/src/@ionic-native/plugins/network/index.ts
index 629ed6f58..fddd2fd35 100644
--- a/src/@ionic-native/plugins/network/index.ts
+++ b/src/@ionic-native/plugins/network/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import {Cordova, CordovaProperty, Plugin, CordovaFunctionOverride} from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/nfc/index.ts b/src/@ionic-native/plugins/nfc/index.ts
index ea0010e3c..ac4d161f8 100644
--- a/src/@ionic-native/plugins/nfc/index.ts
+++ b/src/@ionic-native/plugins/nfc/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 declare let window: any;
diff --git a/src/@ionic-native/plugins/onesignal/index.ts b/src/@ionic-native/plugins/onesignal/index.ts
index 50706f69f..d85ce0024 100644
--- a/src/@ionic-native/plugins/onesignal/index.ts
+++ b/src/@ionic-native/plugins/onesignal/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/pay-pal/index.ts b/src/@ionic-native/plugins/pay-pal/index.ts
index e200ba585..d48198eb9 100644
--- a/src/@ionic-native/plugins/pay-pal/index.ts
+++ b/src/@ionic-native/plugins/pay-pal/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name PayPal
diff --git a/src/@ionic-native/plugins/photo-viewer/index.ts b/src/@ionic-native/plugins/photo-viewer/index.ts
index 4eb3b5a9b..a6775a1c9 100644
--- a/src/@ionic-native/plugins/photo-viewer/index.ts
+++ b/src/@ionic-native/plugins/photo-viewer/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name Photo Viewer
diff --git a/src/@ionic-native/plugins/pin-dialog/index.ts b/src/@ionic-native/plugins/pin-dialog/index.ts
index 013aacb77..bc107ff6b 100644
--- a/src/@ionic-native/plugins/pin-dialog/index.ts
+++ b/src/@ionic-native/plugins/pin-dialog/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/pinterest/index.ts b/src/@ionic-native/plugins/pinterest/index.ts
index 9203425fb..2e45c0800 100644
--- a/src/@ionic-native/plugins/pinterest/index.ts
+++ b/src/@ionic-native/plugins/pinterest/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova, CordovaProperty } from '@ionic-native/core';
 
 export interface PinterestUser {
diff --git a/src/@ionic-native/plugins/power-management/index.ts b/src/@ionic-native/plugins/power-management/index.ts
index 3eac07ca6..72c537b27 100644
--- a/src/@ionic-native/plugins/power-management/index.ts
+++ b/src/@ionic-native/plugins/power-management/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name PowerManagement
diff --git a/src/@ionic-native/plugins/printer/index.ts b/src/@ionic-native/plugins/printer/index.ts
index fb6d0ffc4..ae4dd0667 100644
--- a/src/@ionic-native/plugins/printer/index.ts
+++ b/src/@ionic-native/plugins/printer/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/push/index.ts b/src/@ionic-native/plugins/push/index.ts
index ab9875cb8..5b19df52d 100644
--- a/src/@ionic-native/plugins/push/index.ts
+++ b/src/@ionic-native/plugins/push/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/rollbar/index.ts b/src/@ionic-native/plugins/rollbar/index.ts
index 148faf6e4..d1e0b34c4 100644
--- a/src/@ionic-native/plugins/rollbar/index.ts
+++ b/src/@ionic-native/plugins/rollbar/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/safari-view-controller/index.ts b/src/@ionic-native/plugins/safari-view-controller/index.ts
index 43842755a..0c3d4e534 100644
--- a/src/@ionic-native/plugins/safari-view-controller/index.ts
+++ b/src/@ionic-native/plugins/safari-view-controller/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 export interface SafariViewControllerOptions {
diff --git a/src/@ionic-native/plugins/screen-orientation/index.ts b/src/@ionic-native/plugins/screen-orientation/index.ts
index 1398336d7..04b45fe3c 100644
--- a/src/@ionic-native/plugins/screen-orientation/index.ts
+++ b/src/@ionic-native/plugins/screen-orientation/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, CordovaProperty, Plugin } from '@ionic-native/core';
 
 declare var window;
diff --git a/src/@ionic-native/plugins/screenshot/index.ts b/src/@ionic-native/plugins/screenshot/index.ts
index a282ae3fd..d9b4db121 100644
--- a/src/@ionic-native/plugins/screenshot/index.ts
+++ b/src/@ionic-native/plugins/screenshot/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/securestorage/index.ts b/src/@ionic-native/plugins/securestorage/index.ts
index 3b9a6ac8c..089975004 100644
--- a/src/@ionic-native/plugins/securestorage/index.ts
+++ b/src/@ionic-native/plugins/securestorage/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { CordovaInstance, Plugin } from '@ionic-native/core';
 
 declare var cordova: any;
diff --git a/src/@ionic-native/plugins/serial/index.ts b/src/@ionic-native/plugins/serial/index.ts
index a7784e584..0771c5908 100644
--- a/src/@ionic-native/plugins/serial/index.ts
+++ b/src/@ionic-native/plugins/serial/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/shake/index.ts b/src/@ionic-native/plugins/shake/index.ts
index 7bcf79f80..714e33dd6 100644
--- a/src/@ionic-native/plugins/shake/index.ts
+++ b/src/@ionic-native/plugins/shake/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 /**
diff --git a/src/@ionic-native/plugins/sim/index.ts b/src/@ionic-native/plugins/sim/index.ts
index 7cc6122b2..2b8d6e4cc 100644
--- a/src/@ionic-native/plugins/sim/index.ts
+++ b/src/@ionic-native/plugins/sim/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/sms/index.ts b/src/@ionic-native/plugins/sms/index.ts
index c583b009e..5fc3c2fc0 100644
--- a/src/@ionic-native/plugins/sms/index.ts
+++ b/src/@ionic-native/plugins/sms/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/socialsharing/index.ts b/src/@ionic-native/plugins/socialsharing/index.ts
index fe7269b4f..f59eae9e9 100644
--- a/src/@ionic-native/plugins/socialsharing/index.ts
+++ b/src/@ionic-native/plugins/socialsharing/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/speech-recognition/index.ts b/src/@ionic-native/plugins/speech-recognition/index.ts
index 36bd131aa..6e34877fc 100644
--- a/src/@ionic-native/plugins/speech-recognition/index.ts
+++ b/src/@ionic-native/plugins/speech-recognition/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/spinnerdialog/index.ts b/src/@ionic-native/plugins/spinnerdialog/index.ts
index 8ad636af8..53e305dc7 100644
--- a/src/@ionic-native/plugins/spinnerdialog/index.ts
+++ b/src/@ionic-native/plugins/spinnerdialog/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 export interface SpinnerDialogIOSOptions {
diff --git a/src/@ionic-native/plugins/splashscreen/index.ts b/src/@ionic-native/plugins/splashscreen/index.ts
index 5cc4e2cf0..f4b459c09 100644
--- a/src/@ionic-native/plugins/splashscreen/index.ts
+++ b/src/@ionic-native/plugins/splashscreen/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/sqlite/index.ts b/src/@ionic-native/plugins/sqlite/index.ts
index c95cb1524..d756f54c2 100644
--- a/src/@ionic-native/plugins/sqlite/index.ts
+++ b/src/@ionic-native/plugins/sqlite/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import {Cordova, CordovaInstance, Plugin, pluginWarn, InstanceProperty} from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/statusbar/index.ts b/src/@ionic-native/plugins/statusbar/index.ts
index 6dde5addb..3d15e5626 100644
--- a/src/@ionic-native/plugins/statusbar/index.ts
+++ b/src/@ionic-native/plugins/statusbar/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, CordovaProperty, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/stepcounter/index.ts b/src/@ionic-native/plugins/stepcounter/index.ts
index 7ac9afe82..19f221747 100644
--- a/src/@ionic-native/plugins/stepcounter/index.ts
+++ b/src/@ionic-native/plugins/stepcounter/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name Stepcounter
diff --git a/src/@ionic-native/plugins/streaming-media/index.ts b/src/@ionic-native/plugins/streaming-media/index.ts
index 2766909d1..e1c49e7dd 100644
--- a/src/@ionic-native/plugins/streaming-media/index.ts
+++ b/src/@ionic-native/plugins/streaming-media/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 export interface StreamingVideoOptions {
diff --git a/src/@ionic-native/plugins/stripe/index.ts b/src/@ionic-native/plugins/stripe/index.ts
index 12f412ca6..c68bcd6ef 100644
--- a/src/@ionic-native/plugins/stripe/index.ts
+++ b/src/@ionic-native/plugins/stripe/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import {Plugin, Cordova} from '@ionic-native/core';
 
 export interface StripeCardTokenParams {
diff --git a/src/@ionic-native/plugins/text-to-speech/index.ts b/src/@ionic-native/plugins/text-to-speech/index.ts
index 8b8e46a15..4216363fc 100644
--- a/src/@ionic-native/plugins/text-to-speech/index.ts
+++ b/src/@ionic-native/plugins/text-to-speech/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 export interface TTSOptions {
diff --git a/src/@ionic-native/plugins/themeable-browser/index.ts b/src/@ionic-native/plugins/themeable-browser/index.ts
index 1b0ad37c4..65dff33e3 100644
--- a/src/@ionic-native/plugins/themeable-browser/index.ts
+++ b/src/@ionic-native/plugins/themeable-browser/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, CordovaInstance } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/toast/index.ts b/src/@ionic-native/plugins/toast/index.ts
index 4a3c89df7..08a6dcd00 100644
--- a/src/@ionic-native/plugins/toast/index.ts
+++ b/src/@ionic-native/plugins/toast/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/@ionic-native/plugins/touchid/index.ts b/src/@ionic-native/plugins/touchid/index.ts
index 1408d90a1..aa5df7663 100644
--- a/src/@ionic-native/plugins/touchid/index.ts
+++ b/src/@ionic-native/plugins/touchid/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/twitter-connect/index.ts b/src/@ionic-native/plugins/twitter-connect/index.ts
index a1d3c37ad..4164f88cb 100644
--- a/src/@ionic-native/plugins/twitter-connect/index.ts
+++ b/src/@ionic-native/plugins/twitter-connect/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 export interface TwitterConnectResponse {
diff --git a/src/@ionic-native/plugins/vibration/index.ts b/src/@ionic-native/plugins/vibration/index.ts
index 237d90a66..78c441398 100644
--- a/src/@ionic-native/plugins/vibration/index.ts
+++ b/src/@ionic-native/plugins/vibration/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 
@@ -41,6 +42,6 @@ export class Vibration {
   @Cordova({
     sync: true
   })
-  static vibrate(time: number | Array<number>) { }
+  vibrate(time: number | Array<number>) { }
 
 }
diff --git a/src/@ionic-native/plugins/video-editor/index.ts b/src/@ionic-native/plugins/video-editor/index.ts
index e35b1634e..dbaf5e3bf 100644
--- a/src/@ionic-native/plugins/video-editor/index.ts
+++ b/src/@ionic-native/plugins/video-editor/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 export interface TranscodeOptions {
diff --git a/src/@ionic-native/plugins/video-player/index.ts b/src/@ionic-native/plugins/video-player/index.ts
index d09e7f40f..47270c11b 100644
--- a/src/@ionic-native/plugins/video-player/index.ts
+++ b/src/@ionic-native/plugins/video-player/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, Plugin } from '@ionic-native/core';
 
 /**
diff --git a/src/@ionic-native/plugins/webintent/index.ts b/src/@ionic-native/plugins/webintent/index.ts
index 1982f9862..c7b4aac61 100644
--- a/src/@ionic-native/plugins/webintent/index.ts
+++ b/src/@ionic-native/plugins/webintent/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Cordova, CordovaProperty, Plugin } from '@ionic-native/core';
 
 
diff --git a/src/@ionic-native/plugins/youtube-video-player/index.ts b/src/@ionic-native/plugins/youtube-video-player/index.ts
index 55870a38e..84a7dace9 100644
--- a/src/@ionic-native/plugins/youtube-video-player/index.ts
+++ b/src/@ionic-native/plugins/youtube-video-player/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 /**
  * @name YoutubeVideoPlayer
diff --git a/src/@ionic-native/plugins/z-bar/index.ts b/src/@ionic-native/plugins/z-bar/index.ts
index ed23a8b5e..6201382b2 100644
--- a/src/@ionic-native/plugins/z-bar/index.ts
+++ b/src/@ionic-native/plugins/z-bar/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 export interface ZBarOptions {
diff --git a/src/@ionic-native/plugins/zip/index.ts b/src/@ionic-native/plugins/zip/index.ts
index a9ae2113b..6ec0386c7 100644
--- a/src/@ionic-native/plugins/zip/index.ts
+++ b/src/@ionic-native/plugins/zip/index.ts
@@ -1,3 +1,4 @@
+import { Injectable } from '@angular/core';
 import { Plugin, Cordova } from '@ionic-native/core';
 
 /**