diff --git a/include/mce_battery.h b/include/mce_battery.h
index e2ec595..f3deeed 100644
--- a/include/mce_battery.h
+++ b/include/mce_battery.h
@@ -37,9 +37,11 @@
 #ifndef MCE_BATTERY_H
 #define MCE_BATTERY_H
 
+/* Since 1.0.6 */
+
 #include "mce_types.h"
 
-/* Since 1.0.6 */
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
@@ -53,13 +55,13 @@ typedef enum mce_battery_status {
 
 typedef struct mce_battery_priv MceBatteryPriv;
 
-typedef struct mce_battery {
+struct mce_battery {
     GObject object;
     MceBatteryPriv* priv;
     gboolean valid;
     guint level;
     MCE_BATTERY_STATUS status;
-} MceBattery;
+}; /* MceBattery */
 
 typedef void
 (*MceBatteryFunc)(
@@ -104,7 +106,7 @@ mce_battery_remove_handler(
 void
 mce_battery_remove_handlers(
     MceBattery* battery,
-    gulong *ids,
+    gulong* ids,
     guint count);
 
 #define mce_battery_remove_all_handlers(d, ids) \
diff --git a/include/mce_charger.h b/include/mce_charger.h
index 1ca0a6f..776c884 100644
--- a/include/mce_charger.h
+++ b/include/mce_charger.h
@@ -37,9 +37,11 @@
 #ifndef MCE_CHARGER_H
 #define MCE_CHARGER_H
 
+/* Since 1.0.6 */
+
 #include "mce_types.h"
 
-/* Since 1.0.6 */
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
@@ -51,12 +53,12 @@ typedef enum mce_charger_state {
 
 typedef struct mce_charger_priv MceChargerPriv;
 
-typedef struct mce_charger {
+struct mce_charger {
     GObject object;
     MceChargerPriv* priv;
     gboolean valid;
     MCE_CHARGER_STATE state;
-} MceCharger;
+}; /* MceCharger */
 
 typedef void
 (*MceChargerFunc)(
@@ -95,7 +97,7 @@ mce_charger_remove_handler(
 void
 mce_charger_remove_handlers(
     MceCharger* charger,
-    gulong *ids,
+    gulong* ids,
     guint count);
 
 #define mce_charger_remove_all_handlers(d, ids) \
diff --git a/include/mce_display.h b/include/mce_display.h
index f5dc24e..783b46c 100644
--- a/include/mce_display.h
+++ b/include/mce_display.h
@@ -39,6 +39,8 @@
 
 #include "mce_types.h"
 
+#include <glib-object.h>
+
 G_BEGIN_DECLS
 
 typedef enum mce_display_state {
@@ -49,12 +51,12 @@ typedef enum mce_display_state {
 
 typedef struct mce_display_priv MceDisplayPriv;
 
-typedef struct mce_display {
+struct mce_display {
     GObject object;
     MceDisplayPriv* priv;
     gboolean valid;
     MCE_DISPLAY_STATE state;
-} MceDisplay;
+}; /* MceDisplay */
 
 typedef void
 (*MceDisplayFunc)(
@@ -93,7 +95,7 @@ mce_display_remove_handler(
 void
 mce_display_remove_handlers(
     MceDisplay* display,
-    gulong *ids,
+    gulong* ids,
     guint count);
 
 #define mce_display_remove_all_handlers(d, ids) \
diff --git a/include/mce_log.h b/include/mce_log.h
index bcad793..2cab08b 100644
--- a/include/mce_log.h
+++ b/include/mce_log.h
@@ -38,6 +38,7 @@
 #define MCE_LOG_H
 
 #include "mce_types.h"
+
 #include <gutil_types.h>
 
 G_BEGIN_DECLS
diff --git a/include/mce_tklock.h b/include/mce_tklock.h
index 7018626..8aee093 100644
--- a/include/mce_tklock.h
+++ b/include/mce_tklock.h
@@ -39,6 +39,8 @@
 
 #include "mce_types.h"
 
+#include <glib-object.h>
+
 G_BEGIN_DECLS
 
 typedef enum mce_tklock_mode {
@@ -53,13 +55,13 @@ typedef enum mce_tklock_mode {
 
 typedef struct mce_tklock_priv MceTklockPriv;
 
-typedef struct mce_tklock {
+struct mce_tklock {
     GObject object;
     MceTklockPriv* priv;
     gboolean valid;
     MCE_TKLOCK_MODE mode;
     gboolean locked;
-} MceTklock;
+}; /* MceTklock */
 
 typedef void
 (*MceTklockFunc)(
@@ -104,7 +106,7 @@ mce_tklock_remove_handler(
 void
 mce_tklock_remove_handlers(
     MceTklock* tklock,
-    gulong *ids,
+    gulong* ids,
     guint count);
 
 #define mce_tklock_remove_all_handlers(t, ids) \
diff --git a/include/mce_types.h b/include/mce_types.h
index 5725947..bf75da7 100644
--- a/include/mce_types.h
+++ b/include/mce_types.h
@@ -38,7 +38,15 @@
 #define MCE_TYPES_H
 
 #include <glib.h>
-#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct mce_battery MceBattery;
+typedef struct mce_charger MceCharger;
+typedef struct mce_display MceDisplay;
+typedef struct mce_tklock MceTklock;
+
+G_END_DECLS
 
 #endif /* MCE_TYPES_H */
 
diff --git a/src/mce_battery.c b/src/mce_battery.c
index eada639..1ce4acc 100644
--- a/src/mce_battery.c
+++ b/src/mce_battery.c
@@ -357,7 +357,7 @@ mce_battery_remove_handler(
 void
 mce_battery_remove_handlers(
     MceBattery* self,
-    gulong *ids,
+    gulong* ids,
     guint count)
 {
     gutil_disconnect_handlers(self, ids, count);
diff --git a/src/mce_charger.c b/src/mce_charger.c
index 8cb39b2..e40aa31 100644
--- a/src/mce_charger.c
+++ b/src/mce_charger.c
@@ -257,7 +257,7 @@ mce_charger_remove_handler(
 void
 mce_charger_remove_handlers(
     MceCharger* self,
-    gulong *ids,
+    gulong* ids,
     guint count)
 {
     gutil_disconnect_handlers(self, ids, count);
diff --git a/src/mce_display.c b/src/mce_display.c
index 7a7924a..54c36ca 100644
--- a/src/mce_display.c
+++ b/src/mce_display.c
@@ -257,7 +257,7 @@ mce_display_remove_handler(
 void
 mce_display_remove_handlers(
     MceDisplay* self,
-    gulong *ids,
+    gulong* ids,
     guint count)
 {
     gutil_disconnect_handlers(self, ids, count);
diff --git a/src/mce_proxy.h b/src/mce_proxy.h
index 55bb3c8..e578c89 100644
--- a/src/mce_proxy.h
+++ b/src/mce_proxy.h
@@ -39,6 +39,8 @@
 
 #include "mce_types_p.h"
 
+#include <glib-object.h>
+
 typedef struct mce_proxy_priv MceProxyPriv;
 struct _ComNokiaMceSignal;
 struct _ComNokiaMceRequest;
diff --git a/src/mce_tklock.c b/src/mce_tklock.c
index dac4bca..8f041ac 100644
--- a/src/mce_tklock.c
+++ b/src/mce_tklock.c
@@ -289,7 +289,7 @@ mce_tklock_remove_handler(
 void
 mce_tklock_remove_handlers(
     MceTklock* self,
-    gulong *ids,
+    gulong* ids,
     guint count)
 {
     gutil_disconnect_handlers(self, ids, count);