2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0881d6bf..f4e4439a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 EMACS = emacs
-EMACSFLAGS =
+EMACSFLAGS = -L .
 CASK = cask
 VAGRANT = vagrant
 
-OBJECTS = cider.elc
+ELS = $(wildcard *.el)
+OBJECTS = $(ELS:.el=.elc)
 
 elpa:
 	$(CASK) install
diff --git a/cider-macroexpansion.el b/cider-macroexpansion.el
index 3ab059e3..b3852c9d 100644
--- a/cider-macroexpansion.el
+++ b/cider-macroexpansion.el
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(require 'cider-mode)
+
 (defconst cider-macroexpansion-buffer "*cider-macroexpansion*")
 
 (defun cider-macroexpand-undo (&optional arg)