diff --git a/libsolidity/Compiler.h b/libsolidity/Compiler.h
index 2ffaaa8d0..5f6d9b4e9 100644
--- a/libsolidity/Compiler.h
+++ b/libsolidity/Compiler.h
@@ -21,7 +21,7 @@
  */
 
 #include <libsolidity/ASTVisitor.h>
-#include <libsolidity/CompilerUtilities.h>
+#include <libsolidity/CompilerContext.h>
 
 namespace dev {
 namespace solidity {
diff --git a/libsolidity/CompilerUtilities.cpp b/libsolidity/CompilerContext.cpp
similarity index 100%
rename from libsolidity/CompilerUtilities.cpp
rename to libsolidity/CompilerContext.cpp
diff --git a/libsolidity/CompilerUtilities.h b/libsolidity/CompilerContext.h
similarity index 100%
rename from libsolidity/CompilerUtilities.h
rename to libsolidity/CompilerContext.h
diff --git a/libsolidity/ExpressionCompiler.cpp b/libsolidity/ExpressionCompiler.cpp
index 76fcc2982..53d2d95d9 100644
--- a/libsolidity/ExpressionCompiler.cpp
+++ b/libsolidity/ExpressionCompiler.cpp
@@ -25,6 +25,7 @@
 #include <numeric>
 #include <libsolidity/AST.h>
 #include <libsolidity/ExpressionCompiler.h>
+#include <libsolidity/CompilerContext.h>
 
 using namespace std;
 
diff --git a/libsolidity/ExpressionCompiler.h b/libsolidity/ExpressionCompiler.h
index 28a04f525..a930723cc 100644
--- a/libsolidity/ExpressionCompiler.h
+++ b/libsolidity/ExpressionCompiler.h
@@ -21,11 +21,12 @@
  */
 
 #include <libsolidity/ASTVisitor.h>
-#include <libsolidity/CompilerUtilities.h>
 
 namespace dev {
 namespace solidity {
 
+class CompilerContext; // forward
+
 /// Compiler for expressions, i.e. converts an AST tree whose root is an Expression into a stream
 /// of EVM instructions. It needs a compiler context that is the same for the whole compilation
 /// unit.
@@ -68,7 +69,6 @@ private:
 	void moveToLValue(Expression const& _expression);
 	/// Returns the position of @a m_currentLValue in the stack, where 0 is the top of the stack.
 	unsigned stackPositionOfLValue() const;
-	void adjustStackOffset(eth::Instruction _instruction);
 
 	Declaration* m_currentLValue;
 	CompilerContext& m_context;
diff --git a/test/solidityExpressionCompiler.cpp b/test/solidityExpressionCompiler.cpp
index 2a58d670a..252d2c15e 100644
--- a/test/solidityExpressionCompiler.cpp
+++ b/test/solidityExpressionCompiler.cpp
@@ -27,6 +27,7 @@
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/NameAndTypeResolver.h>
+#include <libsolidity/CompilerContext.h>
 #include <libsolidity/ExpressionCompiler.h>
 #include <libsolidity/AST.h>
 #include <boost/test/unit_test.hpp>