diff --git a/gcc/manifests/init.pp b/gcc/manifests/init.pp
deleted file mode 100644
index 7cccfcf..0000000
--- a/gcc/manifests/init.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# Install GCC
-#
-# On Linux hosts this will also install headers required for compiling
-# kernel modules.
-#
-class gcc {
-
-    package { "gcc":
-        ensure => installed,
-    }
-
-    if $::kernel == Linux {
-        package { "kernel-headers":
-            name   => $::operatingsystem ? {
-                "debian" => "linux-libc-dev",
-                "ubuntu" => "linux-libc-dev",
-                default  => [ "kernel-headers", "kernel-devel", ],
-            },
-            ensure => installed,
-        }
-    }
-
-}
diff --git a/gnu/manifests/init.pp b/gnu/manifests/init.pp
index 541297a..b42c569 100644
--- a/gnu/manifests/init.pp
+++ b/gnu/manifests/init.pp
@@ -1,3 +1,28 @@
+# Install GCC.
+#
+# On Linux hosts this will also install headers required for compiling
+# kernel modules.
+#
+class gnu::gcc {
+
+    package { "gcc":
+        ensure => installed,
+    }
+
+    if $::kernel == Linux {
+        package { "kernel-headers":
+            name   => $::operatingsystem ? {
+                "debian" => "linux-libc-dev",
+                "ubuntu" => "linux-libc-dev",
+                default  => [ "kernel-headers", "kernel-devel", ],
+            },
+            ensure => installed,
+        }
+    }
+
+}
+
+
 # Install GNU make.
 #
 class gnu::make {
diff --git a/ruby/manifests/init.pp b/ruby/manifests/init.pp
index e86fb97..edad47e 100644
--- a/ruby/manifests/init.pp
+++ b/ruby/manifests/init.pp
@@ -4,7 +4,7 @@ class ruby::rubygems {
 
     tag("bootstrap")
 
-    require gcc
+    require gnu::gcc
     require gnu::make
 
     package { "ruby-devel":
diff --git a/vmware/manifests/init.pp b/vmware/manifests/init.pp
index 83fdfdc..4a5a122 100644
--- a/vmware/manifests/init.pp
+++ b/vmware/manifests/init.pp
@@ -11,6 +11,8 @@
 #
 define vmware::bundle() {
 
+    require gnu::gcc
+
     file { "/usr/local/src/${name}.bundle":
         ensure => present,
         source => "puppet:///files/packages/${name}.${architecture}.bundle",
@@ -28,12 +30,10 @@ define vmware::bundle() {
         notify      => Exec["vmware-modconfig"],
     }
 
-    include gcc
     exec { "vmware-modconfig":
         command => "vmware-modconfig --console --install-all",
         path    => "/bin:/usr/bin:/sbin:/usr/sbin",
         creates => "/lib/modules/${kernelrelease}/misc/vmci.ko",
-        require => Class["gcc"],
     }
 
 }