diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index 879939b..0726454 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -1,23 +1,6 @@
 Common_CFlags = ["-Wall"]
 Common_CFlags += ["-Werror"]
 
-cc_library_shared {
-    name: "vendor.qti.hardware.vibrator.impl.fleur",
-    vendor: true,
-    cflags: Common_CFlags,
-    srcs: [
-        "Vibrator.cpp",
-    ],
-    shared_libs: [
-        "libcutils",
-        "libutils",
-        "liblog",
-        "libbinder_ndk",
-        "android.hardware.vibrator-V1-ndk",
-    ],
-    export_include_dirs: ["include"],
-}
-
 cc_binary {
     name: "vendor.qti.hardware.vibrator.service.fleur",
     vendor: true,
@@ -29,13 +12,14 @@ cc_binary {
     cflags: Common_CFlags,
     srcs: [
         "service.cpp",
+        "Vibrator.cpp",
     ],
     shared_libs: [
         "libcutils",
         "libutils",
         "libbase",
         "libbinder_ndk",
+        "liblog",
         "android.hardware.vibrator-V1-ndk",
-        "vendor.qti.hardware.vibrator.impl.fleur",
     ],
 }
diff --git a/vibrator/Vibrator.cpp b/vibrator/Vibrator.cpp
index 8fe4269..22618d8 100644
--- a/vibrator/Vibrator.cpp
+++ b/vibrator/Vibrator.cpp
@@ -38,7 +38,7 @@
 #include <sys/ioctl.h>
 #include <thread>
 
-#include "include/Vibrator.h"
+#include "Vibrator.h"
 
 namespace aidl {
 namespace android {
diff --git a/vibrator/include/Vibrator.h b/vibrator/Vibrator.h
similarity index 100%
rename from vibrator/include/Vibrator.h
rename to vibrator/Vibrator.h