diff --git a/core/Bench.carp b/core/Bench.carp
index 5d49e154..c965afae 100644
--- a/core/Bench.carp
+++ b/core/Bench.carp
@@ -1,6 +1,6 @@
 (load "Statistics.carp")
 
-(system-include "bench.h")
+(system-include "carp_bench.h")
 (register get-time-elapsed (Fn [] Double))
 
 (defmodule Bench
diff --git a/core/Bool.carp b/core/Bool.carp
index f7c2ad9c..6454e976 100644
--- a/core/Bool.carp
+++ b/core/Bool.carp
@@ -1,4 +1,4 @@
-(system-include "bool.h")
+(system-include "carp_bool.h")
 
 (defmodule Bool
   (register = (Fn [Bool Bool] Bool))
diff --git a/core/Char.carp b/core/Char.carp
index 0907cb5d..ea639049 100644
--- a/core/Char.carp
+++ b/core/Char.carp
@@ -1,4 +1,4 @@
-(system-include "char.h")
+(system-include "carp_char.h")
 
 (defmodule Char
   (register = (Fn [Char Char] Bool))
diff --git a/core/Double.carp b/core/Double.carp
index 6c9ed127..e5c948a8 100644
--- a/core/Double.carp
+++ b/core/Double.carp
@@ -1,4 +1,4 @@
-(system-include "double.h")
+(system-include "carp_double.h")
 
 (defmodule Double
   (def pi 3.141592653589793)
diff --git a/core/Float.carp b/core/Float.carp
index 46a3764e..fce3a51e 100644
--- a/core/Float.carp
+++ b/core/Float.carp
@@ -1,4 +1,4 @@
-(system-include "float.h")
+(system-include "carp_float.h")
 
 (defmodule Float
   (def pi 3.1415926536f)
diff --git a/core/IO.carp b/core/IO.carp
index 21e3839e..343f1047 100644
--- a/core/IO.carp
+++ b/core/IO.carp
@@ -1,4 +1,4 @@
-(system-include "io.h")
+(system-include "carp_io.h")
 
 (defmodule IO
   (register println (Fn [(Ref String)] ()))
diff --git a/core/Int.carp b/core/Int.carp
index 3448730e..4c018c96 100644
--- a/core/Int.carp
+++ b/core/Int.carp
@@ -1,4 +1,4 @@
-(system-include "int.h")
+(system-include "carp_int.h")
 
 (defmodule Int
   (register + (λ [Int Int] Int))
diff --git a/core/Long.carp b/core/Long.carp
index f5b1dc7c..39a794d4 100644
--- a/core/Long.carp
+++ b/core/Long.carp
@@ -1,4 +1,4 @@
-(system-include "long.h")
+(system-include "carp_long.h")
 
 (defmodule Long
   (register + (λ [Long Long] Long))
diff --git a/core/System.carp b/core/System.carp
index 23fc2205..e99767db 100644
--- a/core/System.carp
+++ b/core/System.carp
@@ -1,4 +1,4 @@
-(system-include "system.h")
+(system-include "carp_system.h")
 
 (defmodule System
   (register free (Fn [t] ()))
diff --git a/core/bench.h b/core/carp_bench.h
similarity index 100%
rename from core/bench.h
rename to core/carp_bench.h
diff --git a/core/bool.h b/core/carp_bool.h
similarity index 100%
rename from core/bool.h
rename to core/carp_bool.h
diff --git a/core/char.h b/core/carp_char.h
similarity index 100%
rename from core/char.h
rename to core/carp_char.h
diff --git a/core/double.h b/core/carp_double.h
similarity index 100%
rename from core/double.h
rename to core/carp_double.h
diff --git a/core/float.h b/core/carp_float.h
similarity index 100%
rename from core/float.h
rename to core/carp_float.h
diff --git a/core/int.h b/core/carp_int.h
similarity index 100%
rename from core/int.h
rename to core/carp_int.h
diff --git a/core/io.h b/core/carp_io.h
similarity index 100%
rename from core/io.h
rename to core/carp_io.h
diff --git a/core/long.h b/core/carp_long.h
similarity index 100%
rename from core/long.h
rename to core/carp_long.h
diff --git a/core/system.h b/core/carp_system.h
similarity index 100%
rename from core/system.h
rename to core/carp_system.h