12 files changed, 23 insertions, 18 deletions

diff --git a/managers/maemo/maemo-input.h b/managers/maemo/maemo-input.h
index 77f4164..b239958 100644
--- a/managers/maemo/maemo-input.h
+++ b/managers/maemo/maemo-input.h
@@ -21,8 +21,7 @@
 #ifndef _HAVE_MAEMO_INPUT_H
 #define _HAVE_MAEMO_INPUT_H
 
-#include <matchbox2/core/mb-wm.h>
-#include <matchbox2/client-types/mb-wm-client-input.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MaemoInput      MaemoInput;
 typedef struct MaemoInputClass MaemoInputClass;
diff --git a/managers/maemo/maemo-toolbar.h b/managers/maemo/maemo-toolbar.h
index c2dbc6b..2bc453d 100644
--- a/managers/maemo/maemo-toolbar.h
+++ b/managers/maemo/maemo-toolbar.h
@@ -21,8 +21,7 @@
 #ifndef _HAVE_MAEMO_TOOLBAR_H
 #define _HAVE_MAEMO_TOOLBAR_H
 
-#include <matchbox2/core/mb-wm.h>
-#include <matchbox2/client-types/mb-wm-client-panel.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MaemoToolbar      MaemoToolbar;
 typedef struct MaemoToolbarClass MaemoToolbarClass;
diff --git a/managers/maemo/maemo-window-manager.c b/managers/maemo/maemo-window-manager.c
index 656a1ae..19d146c 100644
--- a/managers/maemo/maemo-window-manager.c
+++ b/managers/maemo/maemo-window-manager.c
@@ -21,16 +21,7 @@
 #include "maemo-window-manager.h"
 #include "maemo-toolbar.h"
 #include "maemo-input.h"
-#include "mb-wm-client-app.h"
-#include "mb-wm-client-panel.h"
-#include "mb-wm-client-dialog.h"
-#include "mb-wm-client-desktop.h"
-#include "mb-wm-client-input.h"
-#include "mb-window-manager.h"
-
-#if ENABLE_COMPOSITE
-#include "mb-wm-client-override.h"
-#endif
+#include <matchbox2/mb-wm.h>
 
 #include <stdarg.h>
 
diff --git a/managers/maemo/maemo-window-manager.h b/managers/maemo/maemo-window-manager.h
index 996ce26..5a3082b 100644
--- a/managers/maemo/maemo-window-manager.h
+++ b/managers/maemo/maemo-window-manager.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MAEMO_WINDOW_MANAGER_H
 #define _HAVE_MAEMO_WINDOW_MANAGER_H
 
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
 
 typedef struct MaemoWindowManager        MaemoWindowManager;
 typedef struct MaemoWindowManagerClass   MaemoWindowManagerClass;
diff --git a/managers/maemo/matchbox-window-manager-2-maemo.c b/managers/maemo/matchbox-window-manager-2-maemo.c
index 0667c7d..eec9658 100644
--- a/managers/maemo/matchbox-window-manager-2-maemo.c
+++ b/managers/maemo/matchbox-window-manager-2-maemo.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include "mb-wm.h"
+#include <matchbox2/mb-wm.h>
 #include <signal.h>
 
 enum {
diff --git a/matchbox2/mb-wm-client-base.h b/matchbox2/mb-wm-client-base.h
index edc8008..9d61934 100644
--- a/matchbox2/mb-wm-client-base.h
+++ b/matchbox2/mb-wm-client-base.h
@@ -21,6 +21,8 @@
 #ifndef _HAVE_MB_WM_CLIENT_BASE_H
 #define _HAVE_MB_WM_CLIENT_BASE_H
 
+#include <matchbox2/mb-wm-client.h>
+
 #define MB_WM_CLIENT_BASE(c) ((MBWMClientBase*)(c))
 #define MB_WM_CLIENT_BASE_CLASS(c) ((MBWMClientBaseClass*)(c))
 #define MB_WM_TYPE_CLIENT_BASE (mb_wm_client_base_class_type ())
diff --git a/matchbox2/mb-wm-client-dialog.h b/matchbox2/mb-wm-client-dialog.h
index 9c2c54d..9dd1424 100644
--- a/matchbox2/mb-wm-client-dialog.h
+++ b/matchbox2/mb-wm-client-dialog.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_DIALOG_H
 #define _HAVE_MB_CLIENT_DIALOG_H
 
-#include <matchbox2/mb-wm.h>
+#include <matchbox2/mb-wm-client-base.h>
 
 typedef struct MBWMClientDialog      MBWMClientDialog;
 typedef struct MBWMClientDialogClass MBWMClientDialogClass;
diff --git a/matchbox2/mb-wm-client-window.h b/matchbox2/mb-wm-client-window.h
index a898b6e..50b0aea 100644
--- a/matchbox2/mb-wm-client-window.h
+++ b/matchbox2/mb-wm-client-window.h
@@ -21,6 +21,8 @@
 #ifndef _HAVE_MB_WM_CLIENT_WINDOW_H
 #define _HAVE_MB_WM_CLIENT_WINDOW_H
 
+#include <matchbox2/mb-wm-object.h>
+
 /* FIXME: below limits to 32 props */
 
 /* When a property changes
diff --git a/matchbox2/mb-wm-client.h b/matchbox2/mb-wm-client.h
index 6b63c8e..e752fef 100644
--- a/matchbox2/mb-wm-client.h
+++ b/matchbox2/mb-wm-client.h
@@ -21,6 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_H
 #define _HAVE_MB_CLIENT_H
 
+#include <matchbox2/mb-wm-client-window.h>
 #include <matchbox2/mb-wm-config.h>
 
 #define MB_WM_CLIENT(c) ((MBWindowManagerClient*)(c))
@@ -30,6 +31,8 @@
 #define MB_WM_CLIENT_CLIENT_TYPE(c) \
     (MB_WM_CLIENT_CLASS(MB_WM_OBJECT_GET_CLASS(c))->client_type)
 
+typedef struct MBWindowManagerClient MBWindowManagerClient;
+
 typedef void (*MBWindowManagerClientInitMethod) (MBWindowManagerClient *client);
 
 /* Clients hint to what stacking layer they exist in. By default all
diff --git a/matchbox2/mb-wm-decor.h b/matchbox2/mb-wm-decor.h
index 6adeadf..db0b219 100644
--- a/matchbox2/mb-wm-decor.h
+++ b/matchbox2/mb-wm-decor.h
@@ -21,6 +21,8 @@
 #ifndef _HAVE_MB_WM_DECOR_H
 #define _HAVE_MB_WM_DECOR_H
 
+#include <matchbox2/mb-wm-client.h>
+
 #define MB_WM_DECOR(c) ((MBWMDecor*)(c))
 #define MB_WM_DECOR_CLASS(c) ((MBWMDecorClass*)(c))
 #define MB_WM_TYPE_DECOR (mb_wm_decor_class_type ())
diff --git a/matchbox2/mb-wm-types.h b/matchbox2/mb-wm-types.h
index 9c1c71a..4b73603 100644
--- a/matchbox2/mb-wm-types.h
+++ b/matchbox2/mb-wm-types.h
@@ -84,7 +84,6 @@ typedef struct MBWMRgbaIcon
 } MBWMRgbaIcon;
 
 typedef struct MBWindowManager             MBWindowManager;
-typedef struct MBWindowManagerClient       MBWindowManagerClient;
 typedef struct MBWindowManagerClientClass  MBWindowManagerClientClass;
 typedef struct MBWindowManagerClientPriv   MBWindowManagerClientPriv;
 typedef struct MBWMClientWindow            MBWMClientWindow;
diff --git a/matchbox2/mb-wm.h b/matchbox2/mb-wm.h
index 2e2db49..89a7f3a 100644
--- a/matchbox2/mb-wm.h
+++ b/matchbox2/mb-wm.h
@@ -55,6 +55,14 @@
 #include <matchbox2/mb-wm-root-window.h>
 #include <matchbox2/mb-wm-client.h>
 #include <matchbox2/mb-wm-client-base.h>
+#include <matchbox2/mb-wm-client-app.h>
+#include <matchbox2/mb-wm-client-desktop.h>
+#include <matchbox2/mb-wm-client-dialog.h>
+#include <matchbox2/mb-wm-client-input.h>
+#include <matchbox2/mb-wm-client-menu.h>
+#include <matchbox2/mb-wm-client-note.h>
+#include <matchbox2/mb-wm-client-override.h>
+#include <matchbox2/mb-wm-client-panel.h>
 #include <matchbox2/mb-wm-layout.h>
 #include <matchbox2/mb-wm-stack.h>
 #include <matchbox2/mb-window-manager.h>