diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index 08d37a410..9cb2b1553 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-26  Bradford Hovinen  <hovinen@ximian.com>
+
+	* main.c: Remove #ifdef HAVE_BONOBO instances
+
+	* capplet-dir.c: Remove #idef HAVE_BONOBO instances
+
 2001-10-16  Jakub Steiner <jimmac@ximian.com>
 
 	* control-center.png: usability@ thinks using hands is offensive.
diff --git a/control-center/capplet-dir.c b/control-center/capplet-dir.c
index f88022108..6b7675580 100644
--- a/control-center/capplet-dir.c
+++ b/control-center/capplet-dir.c
@@ -211,7 +211,6 @@ capplet_activate (Capplet *capplet)
 	entry = CAPPLET_DIR_ENTRY (capplet)->entry;
 
 #warning FIXME: this should probably be root-manager-helper
-#ifdef HAVE_BONOBO
 	if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc"))) {
 		if (capplet->launching) {
 			return;
@@ -220,9 +219,7 @@ capplet_activate (Capplet *capplet)
 			gtk_idle_add ((GtkFunction) capplet_reset_cb, capplet);
 			capplet_control_launch (entry->exec[2], entry->name);
 		}
-	} else
-#endif
-	if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) {
+	} else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) {
 		start_capplet_through_root_manager (entry);
 	} else {
 		if (capplet->launching) {
@@ -442,8 +439,6 @@ capplet_close_cb (GtkWidget *widget, GtkWidget *app)
 	CORBA_exception_free (&ev);
 }
 
-#ifdef HAVE_BONOBO
-
 /* capplet_control_launch
  *
  * Launch a capplet as a Bonobo control; returns the relevant BonoboWindow or
@@ -535,5 +530,3 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title)
 
 	return app;
 }
-
-#endif /* HAVE_BONOBO */
diff --git a/control-center/main.c b/control-center/main.c
index f8c653e27..87c118498 100644
--- a/control-center/main.c
+++ b/control-center/main.c
@@ -37,8 +37,6 @@
 #include "capplet-dir.h"
 #include "capplet-dir-view.h"
 
-#ifdef HAVE_BONOBO
-
 static gint 
 real_launch_control (gchar *capplet)
 {
@@ -55,8 +53,6 @@ real_launch_control (gchar *capplet)
 	return FALSE;
 }
 
-#endif
-
 int
 main (int argc, char **argv) 
 {
@@ -67,10 +63,8 @@ main (int argc, char **argv)
 
 	static gchar *capplet = NULL;
 	static struct poptOption gnomecc_options[] = {
-#ifdef HAVE_BONOBO
 		{ "run-capplet", '\0', POPT_ARG_STRING, &capplet, 0,
 		  N_("Run the capplet CAPPLET"), N_("CAPPLET") },
-#endif
 		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 	};
 
@@ -89,9 +83,7 @@ main (int argc, char **argv)
 	gconf_init (argc, argv, NULL);
 #endif
 
-#ifdef HAVE_BONOBO
 	if (capplet == NULL) {
-#endif
 		gnomecc_init ();
 		dir = get_root_capplet_dir ();
 		if (!dir)
@@ -100,11 +92,9 @@ main (int argc, char **argv)
 		if (!entry)
 			return -1;
 		capplet_dir_entry_activate (entry, NULL);
-#ifdef HAVE_BONOBO
 	} else {
 		gtk_idle_add ((GtkFunction) real_launch_control, capplet);
 	}
-#endif
 
 	bonobo_main ();