diff --git a/biometrics/BiometricsFingerprint.cpp b/biometrics/BiometricsFingerprint.cpp
index 968bc4d..5db126e 100644
--- a/biometrics/BiometricsFingerprint.cpp
+++ b/biometrics/BiometricsFingerprint.cpp
@@ -14,18 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll"
 
-#include <hardware/hw_auth_token.h>
-
-#include <hardware/hardware.h>
-#include <hardware/fingerprint.h>
 #include "BiometricsFingerprint.h"
 
-#include <cutils/properties.h>
-#include <inttypes.h>
-#include <unistd.h>
-
 namespace android {
 namespace hardware {
 namespace biometrics {
diff --git a/biometrics/BiometricsFingerprint.h b/biometrics/BiometricsFingerprint.h
index 6d64e3d..42e0b9c 100644
--- a/biometrics/BiometricsFingerprint.h
+++ b/biometrics/BiometricsFingerprint.h
@@ -17,12 +17,20 @@
 #ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 
-#include <log/log.h>
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll"
+
 #include <android/log.h>
+#include <cutils/properties.h>
 #include <hardware/hardware.h>
 #include <hardware/fingerprint.h>
+#include <hardware/hw_auth_token.h>
+#include <hidl/HidlTransportSupport.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <inttypes.h>
+#include <log/log.h>
+#include <unistd.h>
+
 #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
 
 namespace android {
@@ -40,6 +48,7 @@ using ::android::hardware::Void;
 using ::android::hardware::hidl_vec;
 using ::android::hardware::hidl_string;
 using ::android::sp;
+using ::android::status_t;
 
 struct BiometricsFingerprint : public IBiometricsFingerprint {
 public:
diff --git a/biometrics/service.cpp b/biometrics/service.cpp
index 821d091..963aa29 100644
--- a/biometrics/service.cpp
+++ b/biometrics/service.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll"
-
-#include <android/log.h>
-#include <hidl/HidlTransportSupport.h>
-
 #include "BiometricsFingerprint.h"
 
 // libhwbinder: