diff --git a/clarified/manifests/init.pp b/clarified/manifests/init.pp
index 0e881d0..f356cb5 100644
--- a/clarified/manifests/init.pp
+++ b/clarified/manifests/init.pp
@@ -1,23 +1,8 @@
-# Install 32-bit compatibility libraries for 64-bit systems.
-#
-class clarified {
-
-    if $architecture == "x86_64" {
-        case $operatingsystem {
-            ubuntu: {
-                package { "ia32-libs":
-                    ensure => installed,
-                }
-            }
-        }
-    }
-
-}
-
-
 # Install Clarified Analyzer.
 #
-class clarified::analyzer inherits clarified {
+class clarified::analyzer {
+
+    include ia32libs
 
     file { "/usr/local/src/clarified-analyzer-linux-i686.sh":
         ensure => present,
@@ -38,7 +23,9 @@ class clarified::analyzer inherits clarified {
 
 # Install Clarified Recorder.
 #
-class clarified::recorder inherits clarified {
+class clarified::recorder {
+
+    include ia32libs
 
     if $recorder_datadir {
         file { "${recorder_datadir}":
diff --git a/ia32libs/manifests/init.pp b/ia32libs/manifests/init.pp
new file mode 100644
index 0000000..d639728
--- /dev/null
+++ b/ia32libs/manifests/init.pp
@@ -0,0 +1,15 @@
+# Install 32-bit compatibility libraries for 64-bit systems.
+#
+class ia32libs {
+
+    if $architecture == "x86_64" {
+        case $operatingsystem {
+            ubuntu: {
+                package { "ia32-libs":
+                    ensure => installed,
+                }
+            }
+        }
+    }
+
+}