diff --git a/3rdparty/mmu_man/themes/Jamfile b/3rdparty/mmu_man/themes/Jamfile
index c91476e810..00697fb269 100644
--- a/3rdparty/mmu_man/themes/Jamfile
+++ b/3rdparty/mmu_man/themes/Jamfile
@@ -15,6 +15,7 @@ addonSources =
 	DeskbarAddon.cpp
 	EddieAddon.cpp
 	HaikuUISettingsAddon.cpp
+	HaikuWindowDecorAddon.cpp
 	PeAddon.cpp
 	ScreensaverAddon.cpp
 	SoundplayColorAddon.cpp
diff --git a/3rdparty/mmu_man/themes/Utils.cpp b/3rdparty/mmu_man/themes/Utils.cpp
index 74c3a563a9..aab5763678 100644
--- a/3rdparty/mmu_man/themes/Utils.cpp
+++ b/3rdparty/mmu_man/themes/Utils.cpp
@@ -2,6 +2,8 @@
 #include <FindDirectory.h>
 #include <Path.h>
 #include <String.h>
+#include <BeBuild.h>
+
 #include <malloc.h>
 #include <stdio.h>
 
@@ -34,7 +36,8 @@ extern status_t _get_nth_font_folder_(long, font_folder_info **);
 
 status_t find_font_file(entry_ref *to, font_family family, font_style style, float size)
 {
-	status_t err;
+	status_t err = ENOENT;
+#ifdef B_BEOS_VERSION_DANO
 	long i, fontcount, foldercount;
 	font_file_info *ffi;
 	font_folder_info *fdi;
@@ -67,6 +70,7 @@ status_t find_font_file(entry_ref *to, font_family family, font_style style, flo
 		printf("find_font_file: found\n.");
 		return ent.GetRef(to);
 	}
+#endif
 	return ENOENT;
 }
 
diff --git a/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp b/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp
index b136d31c3b..8ef1a98860 100644
--- a/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp
+++ b/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp
@@ -3,8 +3,7 @@
  */
 
 #include <BeBuild.h>
-//#ifdef B_BEOS_VERSION_DANO
-#if 0
+#ifdef B_HAIKU_VERSION_1
 
 #include <Alert.h>
 #include <Application.h>
@@ -24,6 +23,14 @@
 #define instanciate_themes_addon instanciate_themes_addon_ui_settings
 #endif
 
+//XXX: FIXME
+ThemesAddon *instanciate_themes_addon()
+{
+	return NULL;
+}
+
+#if 0 // DANO...
+
 //#define A_NAME "UI Settings"
 #define A_NAME "System Colors and Fonts"
 #define A_MSGNAME Z_THEME_UI_SETTINGS
@@ -205,4 +212,6 @@ ThemesAddon *instanciate_themes_addon()
 	return (ThemesAddon *) new UISettingsThemesAddon;
 }
 
+#endif
+
 #endif /* B_BEOS_VERSION_DANO */
\ No newline at end of file
diff --git a/3rdparty/mmu_man/themes/addons/HaikuWindowDecorAddon.cpp b/3rdparty/mmu_man/themes/addons/HaikuWindowDecorAddon.cpp
index e8928509c6..4b4ec18598 100644
--- a/3rdparty/mmu_man/themes/addons/HaikuWindowDecorAddon.cpp
+++ b/3rdparty/mmu_man/themes/addons/HaikuWindowDecorAddon.cpp
@@ -3,8 +3,7 @@
  */
 
 #include <BeBuild.h>
-//#ifdef B_BEOS_VERSION_DANO
-#if 0
+#ifdef B_HAIKU_VERSION_1
 
 #include <Alert.h>
 #include <Application.h>
@@ -28,6 +27,14 @@
 #define instanciate_themes_addon instanciate_themes_addon_window_decor
 #endif
 
+//XXX: FIXME
+ThemesAddon *instanciate_themes_addon()
+{
+	return NULL;
+}
+
+#if 0 // DANO...
+
 #define A_NAME "Window Decor"
 #define A_MSGNAME Z_THEME_WINDOW_DECORATIONS
 #define A_DESCRIPTION "Window decorations and scrollbars"
@@ -160,4 +167,6 @@ ThemesAddon *instanciate_themes_addon()
 	return (ThemesAddon *) new DecorThemesAddon;
 }
 
+#endif
+
 #endif /* B_BEOS_VERSION_DANO */