diff --git a/.clang-format b/.clang-format
deleted file mode 120000
index 1af4f51d..00000000
--- a/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../.clang-format-4
\ No newline at end of file
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..a7614d29
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,13 @@
+BasedOnStyle: Google
+Standard: Cpp11
+AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IncludeBlocks: Preserve
+IndentWidth: 4
+ContinuationIndentWidth: 8
+PointerAlignment: Left
+TabWidth: 4
+UseTab: Never
diff --git a/libs/.clang-format b/libs/.clang-format
deleted file mode 120000
index e545823f..00000000
--- a/libs/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../../.clang-format-2
\ No newline at end of file
diff --git a/libs/.clang-format b/libs/.clang-format
new file mode 100644
index 00000000..a4e23f86
--- /dev/null
+++ b/libs/.clang-format
@@ -0,0 +1,11 @@
+BasedOnStyle: Google
+Standard: Cpp11
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IncludeBlocks: Preserve
+IndentWidth: 2
+PointerAlignment: Left
+TabWidth: 2
+UseTab: Never
diff --git a/libs/adbconnection/.clang-format b/libs/adbconnection/.clang-format
deleted file mode 120000
index e545823f..00000000
--- a/libs/adbconnection/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../../.clang-format-2
\ No newline at end of file
diff --git a/libs/adbconnection/.clang-format b/libs/adbconnection/.clang-format
new file mode 100644
index 00000000..a4e23f86
--- /dev/null
+++ b/libs/adbconnection/.clang-format
@@ -0,0 +1,11 @@
+BasedOnStyle: Google
+Standard: Cpp11
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IncludeBlocks: Preserve
+IndentWidth: 2
+PointerAlignment: Left
+TabWidth: 2
+UseTab: Never