diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000000..4c10e984fa
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,10 @@
+;; Emacs - Code style and formatting settings
+
+;; C++
+((c++-mode
+  (indent-tabs-mode . t)
+  (tab-width . 4)
+  (c-basic-offset . 4)))
+
+;; Headers should open in C++ mode
+((c-mode . ((mode . c++))))