diff --git a/init/init_msm8974.cpp b/init/init_msm8974.cpp
index ab2f419..7ce2fb2 100644
--- a/init/init_msm8974.cpp
+++ b/init/init_msm8974.cpp
@@ -1,5 +1,6 @@
 /*
-   Copyright (c) 2016, The CyanogenMod Project
+   Copyright (c) 2016, The CyanogenMod Project. All rights reserved.
+   Copyright (c) 2017, The LineageOS Project. All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are
@@ -34,16 +35,18 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <android-base/logging.h>
+
 #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
 #include <sys/_system_properties.h>
 
 #include "vendor_init.h"
 #include "property_service.h"
-#include "log.h"
-#include "util.h"
 
 #include "init_msm8974.h"
 
+using android::init::property_set;
+
 __attribute__ ((weak))
 void init_target_properties()
 {