diff --git a/common/xembed.c b/common/xembed.c
index 6bdce82a4..60c6b2186 100644
--- a/common/xembed.c
+++ b/common/xembed.c
@@ -61,7 +61,6 @@ xembed_message_send(xcb_connection_t *connection, xcb_window_t towin,
 {
     xcb_client_message_event_t ev;
 
-    /** \todo use atom cache */
     p_clear(&ev, 1);
     ev.response_type = XCB_CLIENT_MESSAGE;
     ev.window = towin;
@@ -88,7 +87,6 @@ xembed_info_get(xcb_connection_t *connection, xcb_window_t win, xembed_info_t *i
     uint32_t *data;
     bool ret = false;
 
-    /** \todo use atom cache */
     prop_c = xcb_get_property_unchecked(connection, false, win, _XEMBED_INFO,
                                         XCB_GET_PROPERTY_TYPE_ANY, 0L, 2);
 
diff --git a/common/xembed.h b/common/xembed.h
index 7030a46a2..7500458a1 100644
--- a/common/xembed.h
+++ b/common/xembed.h
@@ -50,44 +50,44 @@ struct xembed_window_t
 DO_SLIST(xembed_window_t, xembed_window, p_delete)
 
 /** The version of the XEMBED protocol that this library supports.  */
-#define XEMBED_VERSION	0
+#define XEMBED_VERSION  0
 
 /** Flags for _XEMBED_INFO */
 #define XEMBED_MAPPED                  (1 << 0)
 #define XEMBED_INFO_FLAGS_ALL          1
 
 /** XEMBED messages */
-#define XEMBED_EMBEDDED_NOTIFY		0
-#define XEMBED_WINDOW_ACTIVATE		1
-#define XEMBED_WINDOW_DEACTIVATE	2
-#define XEMBED_REQUEST_FOCUS		3
-#define XEMBED_FOCUS_IN			4
-#define XEMBED_FOCUS_OUT		5
-#define XEMBED_FOCUS_NEXT		6
-#define XEMBED_FOCUS_PREV		7
+#define XEMBED_EMBEDDED_NOTIFY          0
+#define XEMBED_WINDOW_ACTIVATE          1
+#define XEMBED_WINDOW_DEACTIVATE        2
+#define XEMBED_REQUEST_FOCUS            3
+#define XEMBED_FOCUS_IN                 4
+#define XEMBED_FOCUS_OUT                5
+#define XEMBED_FOCUS_NEXT               6
+#define XEMBED_FOCUS_PREV               7
 /* 8-9 were used for XEMBED_GRAB_KEY/XEMBED_UNGRAB_KEY */
-#define XEMBED_MODALITY_ON		10
-#define XEMBED_MODALITY_OFF		11
-#define XEMBED_REGISTER_ACCELERATOR	12
-#define XEMBED_UNREGISTER_ACCELERATOR	13
-#define XEMBED_ACTIVATE_ACCELERATOR	14
+#define XEMBED_MODALITY_ON              10
+#define XEMBED_MODALITY_OFF             11
+#define XEMBED_REGISTER_ACCELERATOR     12
+#define XEMBED_UNREGISTER_ACCELERATOR   13
+#define XEMBED_ACTIVATE_ACCELERATOR     14
 
 /** Details for XEMBED_FOCUS_IN */
-#define XEMBED_FOCUS_CURRENT		0
-#define XEMBED_FOCUS_FIRST		1
-#define XEMBED_FOCUS_LAST		2
+#define XEMBED_FOCUS_CURRENT            0
+#define XEMBED_FOCUS_FIRST              1
+#define XEMBED_FOCUS_LAST               2
 
 
 /** Modifiers field for XEMBED_REGISTER_ACCELERATOR */
-#define XEMBED_MODIFIER_SHIFT	(1 << 0)
-#define XEMBED_MODIFIER_CONTROL	(1 << 1)
-#define XEMBED_MODIFIER_ALT	(1 << 2)
-#define XEMBED_MODIFIER_SUPER	(1 << 3)
-#define XEMBED_MODIFIER_HYPER	(1 << 4)
+#define XEMBED_MODIFIER_SHIFT   (1 << 0)
+#define XEMBED_MODIFIER_CONTROL (1 << 1)
+#define XEMBED_MODIFIER_ALT     (1 << 2)
+#define XEMBED_MODIFIER_SUPER   (1 << 3)
+#define XEMBED_MODIFIER_HYPER   (1 << 4)
 
 
 /** Flags for XEMBED_ACTIVATE_ACCELERATOR */
-#define XEMBED_ACCELERATOR_OVERLOADED	(1 << 0)
+#define XEMBED_ACCELERATOR_OVERLOADED   (1 << 0)
 
 
 void xembed_message_send(xcb_connection_t *, xcb_window_t, long, long, long, long);
@@ -101,7 +101,7 @@ bool xembed_info_get(xcb_connection_t *, xcb_window_t, xembed_info_t *);
  * \param focus_type The type of focus.
  */
 static inline void
-xembed_focus_in (xcb_connection_t *c, xcb_window_t client, long focus_type)
+xembed_focus_in(xcb_connection_t *c, xcb_window_t client, long focus_type)
 {
     xembed_message_send(c, client, XEMBED_FOCUS_IN, focus_type, 0, 0);
 }
@@ -113,7 +113,7 @@ xembed_focus_in (xcb_connection_t *c, xcb_window_t client, long focus_type)
 static inline void
 xembed_window_activate(xcb_connection_t *c, xcb_window_t client)
 {
-     xembed_message_send(c, client, XEMBED_WINDOW_ACTIVATE, 0, 0, 0);
+    xembed_message_send(c, client, XEMBED_WINDOW_ACTIVATE, 0, 0, 0);
 }
 
 /** Notify a window that it has become inactive.
@@ -137,7 +137,7 @@ xembed_embedded_notify(xcb_connection_t *c,
                        xcb_window_t client, xcb_window_t embedder,
                        long version)
 {
-     xembed_message_send(c, client, XEMBED_EMBEDDED_NOTIFY, 0, embedder, version);
+    xembed_message_send(c, client, XEMBED_EMBEDDED_NOTIFY, 0, embedder, version);
 }
 
 #endif