diff --git a/universal7885-common/init/Android.bp b/universal7885-common/init/Android.bp
index c112531..fe6cf95 100644
--- a/universal7885-common/init/Android.bp
+++ b/universal7885-common/init/Android.bp
@@ -15,10 +15,8 @@
 cc_library_static {
     name: "libinit_universal7884B",
     recovery_available: true,
-    shared_libs: ["libbase"],
+    whole_static_libs: ["libbase"],
+    header_libs: ["libbase_headers"],
     srcs: ["init_universal7884B.cpp"],
-    include_dirs: [
-        "system/core/base/include",
-        "system/core/init"
-    ]
+    include_dirs: ["system/core/init"]
 }
diff --git a/universal7885-common/power/Android.bp b/universal7885-common/power/Android.bp
index b5e9d7c..f71b7c2 100644
--- a/universal7885-common/power/Android.bp
+++ b/universal7885-common/power/Android.bp
@@ -21,8 +21,7 @@ cc_binary {
         "Power.cpp",
         "service.cpp",
     ],
-
-    include_dirs: ["hardware/samsung/hidl/light/include"],
+    
     local_include_dirs: ["include"],
 
     shared_libs: [
diff --git a/universal7885-common/power/Power.cpp b/universal7885-common/power/Power.cpp
index 722e703..0d1de9b 100644
--- a/universal7885-common/power/Power.cpp
+++ b/universal7885-common/power/Power.cpp
@@ -106,14 +106,17 @@ Return<void> Power::powerHint(PowerHint hint, int32_t data) {
 
     switch (hint) {
         case PowerHint::INTERACTION:
-        case PowerHint::LAUNCH:
+	case PowerHint::VSYNC:
+	case PowerHint::SUSTAINED_PERFORMANCE:
+	case PowerHint::VR_MODE:
+	case PowerHint::VIDEO_ENCODE:
+	case PowerHint::VIDEO_DECODE:
+	case PowerHint::LAUNCH:
             sendBoostpulse();
             break;
         case PowerHint::LOW_POWER:
             setProfile(data ? PowerProfile::POWER_SAVE : PowerProfile::BALANCED);
             break;
-        default:
-            break;
     }
     return Void();
 }
diff --git a/universal7885-common/power/include/samsung_lights.h b/universal7885-common/power/include/samsung_lights.h
new file mode 100644
index 0000000..accd97e
--- /dev/null
+++ b/universal7885-common/power/include/samsung_lights.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ * Copyright (C) 2017 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SAMSUNG_LIGHTS_H
+#define SAMSUNG_LIGHTS_H
+
+/*
+ * Board specific nodes
+ *
+ * If your kernel exposes these controls in another place, you can either
+ * symlink to the locations given here, or override this header in your
+ * device tree.
+ */
+#define PANEL_BRIGHTNESS_NODE "/sys/class/backlight/panel/brightness"
+#define PANEL_MAX_BRIGHTNESS_NODE "/sys/class/backlight/panel/max_brightness"
+#define BUTTON_BRIGHTNESS_NODE "/sys/class/sec/sec_touchkey/brightness"
+#define LED_BLINK_NODE "/sys/class/sec/led/led_blink"
+#define LED_BLN_NODE "/sys/class/misc/backlightnotification/notification_led"
+
+// Uncomment to enable variable button brightness
+//#define VAR_BUTTON_BRIGHTNESS 1
+
+/*
+ * Brightness adjustment factors
+ *
+ * If one of your device's LEDs is more powerful than the others, use these
+ * values to equalise them. This value is in the range 0.0-1.0.
+ */
+#define LED_ADJUSTMENT_R 1.0
+#define LED_ADJUSTMENT_G 1.0
+#define LED_ADJUSTMENT_B 1.0
+
+/*
+ * Light brightness factors
+ *
+ * It might make sense for all colours to be scaled down (for example, if your
+ * LED is too bright). Use these values to adjust the brightness of each
+ * light. This value is within the range 0-255.
+ */
+#define LED_BRIGHTNESS_BATTERY 255
+#define LED_BRIGHTNESS_NOTIFICATION 255
+#define LED_BRIGHTNESS_ATTENTION 255
+
+#endif  // SAMSUNG_LIGHTS_H