diff --git a/openbox/actions.c b/openbox/actions.c
index d43896d7..948ac2c0 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -58,7 +58,6 @@ struct _ObActionsAct {
 
 static GSList *registered = NULL;
 
-
 void actions_startup(gboolean reconfig)
 {
     if (reconfig) return;
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 142fec51..bc70748b 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -122,8 +122,6 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
     guint d;
 
-
-
     switch (o->type) {
     case LAST:
         d = screen_last_desktop;
diff --git a/openbox/client.c b/openbox/client.c
index 585379ec..7062cabd 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -108,7 +108,6 @@ static void client_call_notifies(ObClient *self, GSList *list);
 static void client_ping_event(ObClient *self, gboolean dead);
 static void client_prompt_kill(ObClient *self);
 
-
 void client_startup(gboolean reconfig)
 {
     if ((client_default_icon = RrImageCacheFind(ob_rr_icons,
@@ -503,7 +502,6 @@ void client_manage(Window window, ObPrompt *prompt)
                             (client_search_focus_tree_full(self) != NULL ||
                              client_search_focus_group_full(self) != NULL));
 
-
         /* This is focus stealing prevention */
         ob_debug_type(OB_DEBUG_FOCUS,
                       "Want to focus new window 0x%x at time %u "
@@ -658,7 +656,6 @@ void client_manage(Window window, ObPrompt *prompt)
     return;
 }
 
-
 ObClient *client_fake_manage(Window window)
 {
     ObClient *self;
@@ -1381,7 +1378,6 @@ static void client_update_transient_tree(ObClient *self,
       transient windows as their children.
       * * */
 
-
     /* No change has occured */
     if (oldgroup == newgroup &&
         oldgtran == newgtran &&
@@ -2194,7 +2190,6 @@ void client_update_icons(ObClient *self)
                                        (gint*)&w, (gint*)&h, &data);
                 xerror_set_ignore(FALSE);
 
-
                 if (xicon) {
                     if (w > 0 && h > 0) {
                         /* is this icon in the cache yet? */
@@ -2686,7 +2681,6 @@ gboolean client_enter_focusable(ObClient *self)
             self->type != OB_CLIENT_TYPE_DESKTOP);
 }
 
-
 static void client_apply_startup_state(ObClient *self,
                                        gint x, gint y, gint w, gint h)
 {
@@ -2996,7 +2990,6 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
     g_assert(*h > 0);
 }
 
-
 void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
                       gboolean user, gboolean final, gboolean force_reply)
 {
diff --git a/openbox/config.h b/openbox/config.h
index 62b92473..69fe6ff4 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -198,5 +198,4 @@ ObAppSettings* config_create_app_settings();
 void config_app_settings_copy_non_defaults(const ObAppSettings *src,
                                            ObAppSettings *dest);
 
-
 #endif
diff --git a/openbox/event.c b/openbox/event.c
index a7f65fcb..3abaa675 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1114,7 +1114,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 move = TRUE;
             }
 
-
         if (e->xconfigurerequest.value_mask & CWStackMode) {
             ObClient *sibling = NULL;
             gulong ignore_start;
diff --git a/openbox/focus.c b/openbox/focus.c
index 12625fde..63eb2cca 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -359,4 +359,3 @@ gboolean focus_valid_target(ObClient *ft,
 
     return ok;
 }
-
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index c7fc42ee..e30672dc 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -96,7 +96,6 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
         list = client_list;
     }
 
-
     if (focus_cycle_target == NULL) {
         focus_cycle_iconic_windows = TRUE;
         focus_cycle_all_desktops = all_desktops;
diff --git a/openbox/frame.c b/openbox/frame.c
index ca5dbb6c..235dd30b 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -590,7 +590,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                                                  sidebwidth) * 2,
                                   self->bwidth);
 
-
                 if (sidebwidth) {
                     XMoveResizeWindow(ob_display, self->lgripleft,
                                       0,
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index c318a4cf..e62cff8a 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -326,4 +326,3 @@ void keyboard_shutdown(gboolean reconfig)
     popup_free(popup);
     popup = NULL;
 }
-
diff --git a/openbox/keytree.h b/openbox/keytree.h
index 391cb154..66edc3c7 100644
--- a/openbox/keytree.h
+++ b/openbox/keytree.h
@@ -42,5 +42,4 @@ void tree_assimilate(KeyBindingTree *node);
 KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
 gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);
 
-
 #endif
diff --git a/openbox/menu.c b/openbox/menu.c
index 0c10b757..23a0527a 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -62,7 +62,6 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
                                gchar **strippedlabel, guint *position,
                                gboolean *always_show);
 
-
 static void client_dest(ObClient *client, gpointer data)
 {
     /* menus can be associated with a client, so close any that are since
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index ac1d88d5..a9b54408 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -696,7 +696,6 @@ void menu_frame_render(ObMenuFrame *self)
         XSetWindowBorder(ob_display, e->window,
                          RrColorPixel(ob_rr_theme->menu_border_color));
 
-
         text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
                   !e->entry->data.normal.enabled ?
                   /* disabled */
@@ -1086,7 +1085,6 @@ void menu_frame_hide_all_client(ObClient *client)
     }
 }
 
-
 ObMenuFrame* menu_frame_under(gint x, gint y)
 {
     ObMenuFrame *ret = NULL;
diff --git a/openbox/modkeys.c b/openbox/modkeys.c
index 9e8da321..c52cbef1 100644
--- a/openbox/modkeys.c
+++ b/openbox/modkeys.c
@@ -187,4 +187,3 @@ KeyCode modkeys_sym_to_code(KeySym sym)
                 return i;
     return 0;
 }
-
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 9374f8b5..c023340e 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -348,7 +348,6 @@ static void do_move(gboolean keyboard, gint keydist)
                      moveresize_client->frame->area.y);
 }
 
-
 static void do_resize(void)
 {
     gint x, y, w, h, lw, lh;
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 7221556e..4a49c802 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -85,7 +85,6 @@
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 
-
 RrInstance   *ob_rr_inst;
 RrImageCache *ob_rr_icons;
 RrTheme      *ob_rr_theme;
@@ -148,7 +147,6 @@ gint main(gint argc, gchar **argv)
         session_startup(argc, argv);
     }
 
-
     ob_display = XOpenDisplay(NULL);
     if (ob_display == NULL)
         ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
@@ -223,7 +221,6 @@ gint main(gint argc, gchar **argv)
     cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
                                                XC_top_left_corner);
 
-
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
diff --git a/openbox/prompt.c b/openbox/prompt.c
index f531b70c..53ed2d7d 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -294,7 +294,6 @@ static void prompt_layout(ObPrompt *self)
         self->button[i].width = MAX(self->button[i].width, bw);
         self->button[i].height = MAX(self->button[i].height, bh);
 
-
         self->button[i].width += BUTTON_HMARGIN * 2;
         self->button[i].height += BUTTON_VMARGIN * 2;
 
diff --git a/openbox/session.c b/openbox/session.c
index ab6864b3..77dc5de0 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -397,7 +397,6 @@ static void sm_save_yourself_2(SmcConn conn, SmPointer data)
     SmcSaveYourselfDone(conn, success);
 }
 
-
 static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
                              Bool shutdown, gint interact_style, Bool fast)
 {
diff --git a/render/gradient.c b/render/gradient.c
index fc75047f..2f9bfd27 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -659,7 +659,6 @@ static void gradient_vertical(RrSurface *sf, gint w, gint h)
     }
 }
 
-
 static void gradient_diagonal(RrSurface *sf, gint w, gint h)
 {
     gint x, y;
diff --git a/render/render.c b/render/render.c
index fd442d26..7c00c146 100644
--- a/render/render.c
+++ b/render/render.c
@@ -333,7 +333,6 @@ void RrAppearanceFree(RrAppearance *a)
     }
 }
 
-
 static void pixel_data_to_pixmap(RrAppearance *l,
                                  gint x, gint y, gint w, gint h)
 {
diff --git a/render/test.c b/render/test.c
index 36c962da..55ab621e 100644
--- a/render/test.c
+++ b/render/test.c
@@ -90,7 +90,6 @@ gint main()
     exit (0);
 #endif
 
-
     RrPaint(look, win, w, h);
     done = 0;
     while (!done) {
diff --git a/render/theme.c b/render/theme.c
index 8c7393b5..d040c171 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -567,7 +567,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
     theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH;
     theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT;
 
-
     /* read the decoration textures */
     if (!read_appearance(db, inst,
                          "window.active.title.bg", theme->a_focused_title,
@@ -1763,7 +1762,6 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad,
         *interlaced = FALSE;
 }
 
-
 static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
                                 const gchar *rname, RrAppearance *value,
                                 gboolean allow_trans)
diff --git a/tests/usertimewin.c b/tests/usertimewin.c
index 7ef934f2..7a2aa973 100644
--- a/tests/usertimewin.c
+++ b/tests/usertimewin.c
@@ -66,7 +66,6 @@ int main () {
                   PropModeReplace, (unsigned char*)&num, 1);
   XFlush(display);
 
-
   while (1) {
     XNextEvent(display, &report);
   }