diff --git a/.emacs.d/lisp/init-cc.el b/.emacs.d/lisp/init-cc.el
index 2aaf355f..1642d9a1 100644
--- a/.emacs.d/lisp/init-cc.el
+++ b/.emacs.d/lisp/init-cc.el
@@ -10,6 +10,8 @@
     "M-TAB" 'semantic-complete-analyze-inline))
 ;; (define-key map (kbd "C-c o") 'ff-find-other-file)
 
+(defvaralias 'c-basic-offset 'tab-width)
+
 ;;; C additional faces.
 ;;; Useless in quasi-monochrome.
 ;; (dolist (mode '(c-mode c++-mode))
diff --git a/.emacs.d/lisp/init-sh.el b/.emacs.d/lisp/init-sh.el
index 874a3642..290012f4 100644
--- a/.emacs.d/lisp/init-sh.el
+++ b/.emacs.d/lisp/init-sh.el
@@ -1,5 +1,6 @@
 ;;; Sh
 
+(defvaralias 'sh-basic-offset 'tab-width)
 (defvaralias 'sh-indentation 'sh-basic-offset)
 
 (setq sh-indent-comment t)
diff --git a/.emacs.d/lisp/main.el b/.emacs.d/lisp/main.el
index 8cded5ed..1fd6508f 100644
--- a/.emacs.d/lisp/main.el
+++ b/.emacs.d/lisp/main.el
@@ -92,11 +92,6 @@
 (defvaralias 'standard-indent 'tab-width)
 (setq-default indent-tabs-mode t)
 
-;;; This needs to be set globally since they are defined as local variable and
-;;; Emacs does not know how to set an alias on a local variable.
-(defvaralias 'c-basic-offset 'tab-width)
-(defvaralias 'sh-basic-offset 'tab-width)
-
 ;;; Line by line scrolling
 (setq scroll-step 1)