diff --git a/lib/typed/compiler.rb b/lib/typed/compiler.rb
index c4004ec1..12c39098 100644
--- a/lib/typed/compiler.rb
+++ b/lib/typed/compiler.rb
@@ -1,6 +1,7 @@
 module Typed
 
-  CompilerModules = ["assignment" , "call_site", "if_statement" ,"name_expression"]
+  CompilerModules = [ "assignment" , "basic_values" , "call_site", "if_statement" ,
+                      "name_expression"]
   CompilerModules.each do |mod|
     require_relative "compiler/" + mod
   end
diff --git a/lib/typed/compiler/basic_values.rb b/lib/typed/compiler/basic_values.rb
index 0366c537..8e9aba73 100644
--- a/lib/typed/compiler/basic_values.rb
+++ b/lib/typed/compiler/basic_values.rb
@@ -1,7 +1,7 @@
 module Typed
   # collection of the simple ones, int and strings and such
 
-  Compiler.class_eval do
+  module BasicValues
 
     # Constant expressions can by definition be evaluated at compile time.
     # But that does not solve their storage, ie they need to be accessible at runtime from _somewhere_