diff --git a/src/client/ply-boot-client.c b/src/client/ply-boot-client.c
index 9cd129bb..ba367d21 100644
--- a/src/client/ply-boot-client.c
+++ b/src/client/ply-boot-client.c
@@ -832,4 +832,3 @@ ply_boot_client_attach_to_event_loop (ply_boot_client_t *client,
                                        client);
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/client/ply-boot-client.h b/src/client/ply-boot-client.h
index 3ccf9b3c..842b48ab 100644
--- a/src/client/ply-boot-client.h
+++ b/src/client/ply-boot-client.h
@@ -156,4 +156,3 @@ void ply_boot_client_tell_daemon_about_error (ply_boot_client_t
 #endif
 
 #endif /* PLY_BOOT_CLIENT_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/client/plymouth.c b/src/client/plymouth.c
index 54510520..d9beeb24 100644
--- a/src/client/plymouth.c
+++ b/src/client/plymouth.c
@@ -1227,4 +1227,3 @@ out:
 
         return exit_code;
 }
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h
index a260b142..4410b165 100644
--- a/src/libply-splash-core/ply-boot-splash-plugin.h
+++ b/src/libply-splash-core/ply-boot-splash-plugin.h
@@ -105,4 +105,3 @@ typedef struct
 } ply_boot_splash_plugin_interface_t;
 
 #endif /* PLY_BOOT_SPLASH_PLUGIN_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-boot-splash.c b/src/libply-splash-core/ply-boot-splash.c
index b82bd648..716ca663 100644
--- a/src/libply-splash-core/ply-boot-splash.c
+++ b/src/libply-splash-core/ply-boot-splash.c
@@ -736,4 +736,3 @@ ply_boot_splash_uses_pixel_displays (ply_boot_splash_t *splash)
         return splash->plugin_interface->add_pixel_display != NULL;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-boot-splash.h b/src/libply-splash-core/ply-boot-splash.h
index 933375df..df57b8c9 100644
--- a/src/libply-splash-core/ply-boot-splash.h
+++ b/src/libply-splash-core/ply-boot-splash.h
@@ -102,4 +102,3 @@ bool ply_boot_splash_uses_pixel_displays (ply_boot_splash_t *splash);
 #endif
 
 #endif /* PLY_BOOT_SPLASH_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-device-manager.h b/src/libply-splash-core/ply-device-manager.h
index 1b42a2a0..676012f0 100644
--- a/src/libply-splash-core/ply-device-manager.h
+++ b/src/libply-splash-core/ply-device-manager.h
@@ -78,4 +78,3 @@ ply_terminal_t *ply_device_manager_get_default_terminal (ply_device_manager_t *m
 #endif
 
 #endif
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-keyboard.c b/src/libply-splash-core/ply-keyboard.c
index 6e9b98cf..31e1ca53 100644
--- a/src/libply-splash-core/ply-keyboard.c
+++ b/src/libply-splash-core/ply-keyboard.c
@@ -651,4 +651,3 @@ ply_keyboard_get_renderer (ply_keyboard_t *keyboard)
         return NULL;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-keyboard.h b/src/libply-splash-core/ply-keyboard.h
index 008a804f..dd8a3f84 100644
--- a/src/libply-splash-core/ply-keyboard.h
+++ b/src/libply-splash-core/ply-keyboard.h
@@ -78,4 +78,3 @@ ply_renderer_t *ply_keyboard_get_renderer (ply_keyboard_t *keyboard);
 
 #endif /* PLY_KEYBOARD_H */
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-pixel-buffer.c b/src/libply-splash-core/ply-pixel-buffer.c
index 80146bf8..0ba03fd4 100644
--- a/src/libply-splash-core/ply-pixel-buffer.c
+++ b/src/libply-splash-core/ply-pixel-buffer.c
@@ -1142,4 +1142,3 @@ ply_pixel_buffer_rotate_upright (ply_pixel_buffer_t *old_buffer)
         return buffer;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-pixel-buffer.h b/src/libply-splash-core/ply-pixel-buffer.h
index 1f606a2e..bcfc6433 100644
--- a/src/libply-splash-core/ply-pixel-buffer.h
+++ b/src/libply-splash-core/ply-pixel-buffer.h
@@ -168,4 +168,3 @@ ply_pixel_buffer_t *ply_pixel_buffer_rotate_upright (ply_pixel_buffer_t *old_buf
 #endif
 
 #endif /* PLY_PIXEL_BUFFER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-pixel-display.c b/src/libply-splash-core/ply-pixel-display.c
index 8ef93b15..62119bcc 100644
--- a/src/libply-splash-core/ply-pixel-display.c
+++ b/src/libply-splash-core/ply-pixel-display.c
@@ -189,4 +189,3 @@ ply_pixel_display_set_draw_handler (ply_pixel_display_t             *display,
         display->draw_handler_user_data = user_data;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-pixel-display.h b/src/libply-splash-core/ply-pixel-display.h
index 6e92c24d..5fff2e4a 100644
--- a/src/libply-splash-core/ply-pixel-display.h
+++ b/src/libply-splash-core/ply-pixel-display.h
@@ -70,4 +70,3 @@ void ply_pixel_display_unpause_updates (ply_pixel_display_t *display);
 
 #endif /* PLY_PIXEL_DISPLAY_H */
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-renderer-plugin.h b/src/libply-splash-core/ply-renderer-plugin.h
index 5d86f924..6817dac1 100644
--- a/src/libply-splash-core/ply-renderer-plugin.h
+++ b/src/libply-splash-core/ply-renderer-plugin.h
@@ -79,4 +79,3 @@ typedef struct
 } ply_renderer_plugin_interface_t;
 
 #endif /* PLY_RENDERER_PLUGIN_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-renderer.c b/src/libply-splash-core/ply-renderer.c
index e23acb74..edebc030 100644
--- a/src/libply-splash-core/ply-renderer.c
+++ b/src/libply-splash-core/ply-renderer.c
@@ -453,4 +453,3 @@ ply_renderer_get_keymap (ply_renderer_t *renderer)
         return renderer->plugin_interface->get_keymap (renderer->backend);
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-renderer.h b/src/libply-splash-core/ply-renderer.h
index ed2db34c..0b4e0323 100644
--- a/src/libply-splash-core/ply-renderer.h
+++ b/src/libply-splash-core/ply-renderer.h
@@ -90,4 +90,3 @@ const char *ply_renderer_get_keymap (ply_renderer_t *renderer);
 #endif
 
 #endif /* PLY_RENDERER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
index 28970787..686b4f4f 100644
--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
@@ -1101,4 +1101,3 @@ ply_terminal_stop_watching_for_input (ply_terminal_t              *terminal,
         }
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-terminal.h b/src/libply-splash-core/ply-terminal.h
index 4ca4c81c..c701f2ca 100644
--- a/src/libply-splash-core/ply-terminal.h
+++ b/src/libply-splash-core/ply-terminal.h
@@ -120,4 +120,3 @@ void ply_terminal_stop_watching_for_input (ply_terminal_t              *terminal
 
 #endif /* PLY_TERMINAL_H */
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-text-display.c b/src/libply-splash-core/ply-text-display.c
index 6eaea421..09650744 100644
--- a/src/libply-splash-core/ply-text-display.c
+++ b/src/libply-splash-core/ply-text-display.c
@@ -333,4 +333,3 @@ ply_text_display_get_terminal (ply_text_display_t *display)
         return display->terminal;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-text-display.h b/src/libply-splash-core/ply-text-display.h
index 774dd4d5..23e33281 100644
--- a/src/libply-splash-core/ply-text-display.h
+++ b/src/libply-splash-core/ply-text-display.h
@@ -87,4 +87,3 @@ void ply_text_display_unpause_updates (ply_text_display_t *display);
 
 #endif /* PLY_TEXT_DISPLAY_H */
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-text-progress-bar.c b/src/libply-splash-core/ply-text-progress-bar.c
index a7175c88..1bfd4cca 100644
--- a/src/libply-splash-core/ply-text-progress-bar.c
+++ b/src/libply-splash-core/ply-text-progress-bar.c
@@ -286,4 +286,3 @@ ply_text_progress_bar_get_number_of_rows (ply_text_progress_bar_t *progress_bar)
         return progress_bar->number_of_rows;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-text-progress-bar.h b/src/libply-splash-core/ply-text-progress-bar.h
index fe6e6667..77c0eea4 100644
--- a/src/libply-splash-core/ply-text-progress-bar.h
+++ b/src/libply-splash-core/ply-text-progress-bar.h
@@ -52,4 +52,3 @@ int ply_text_progress_bar_get_number_of_columns (ply_text_progress_bar_t *progre
 #endif
 
 #endif /* PLY_TEXT_PULSER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-text-step-bar.c b/src/libply-splash-core/ply-text-step-bar.c
index f54fc56f..5ce62827 100644
--- a/src/libply-splash-core/ply-text-step-bar.c
+++ b/src/libply-splash-core/ply-text-step-bar.c
@@ -156,4 +156,3 @@ ply_text_step_bar_get_number_of_rows (ply_text_step_bar_t *step_bar)
         return step_bar->number_of_rows;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-core/ply-text-step-bar.h b/src/libply-splash-core/ply-text-step-bar.h
index f0aa4a6c..1cf3173a 100644
--- a/src/libply-splash-core/ply-text-step-bar.h
+++ b/src/libply-splash-core/ply-text-step-bar.h
@@ -46,4 +46,3 @@ int ply_text_step_bar_get_number_of_columns (ply_text_step_bar_t *step_bar);
 #endif
 
 #endif /* PLY_TEXT_PULSER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-animation.c b/src/libply-splash-graphics/ply-animation.c
index e7dc5615..f9c13c90 100644
--- a/src/libply-splash-graphics/ply-animation.c
+++ b/src/libply-splash-graphics/ply-animation.c
@@ -409,4 +409,3 @@ ply_animation_get_height (ply_animation_t *animation)
         return animation->height;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-animation.h b/src/libply-splash-graphics/ply-animation.h
index e91624be..d3ccc6fc 100644
--- a/src/libply-splash-graphics/ply-animation.h
+++ b/src/libply-splash-graphics/ply-animation.h
@@ -58,4 +58,3 @@ long ply_animation_get_height (ply_animation_t *animation);
 #endif
 
 #endif /* ANIMATION_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-capslock-icon.c b/src/libply-splash-graphics/ply-capslock-icon.c
index 9c96727d..c8760d50 100644
--- a/src/libply-splash-graphics/ply-capslock-icon.c
+++ b/src/libply-splash-graphics/ply-capslock-icon.c
@@ -233,4 +233,3 @@ ply_capslock_icon_get_height (ply_capslock_icon_t *capslock_icon)
         return capslock_icon->height;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-capslock-icon.h b/src/libply-splash-graphics/ply-capslock-icon.h
index e3119494..9e8c523e 100644
--- a/src/libply-splash-graphics/ply-capslock-icon.h
+++ b/src/libply-splash-graphics/ply-capslock-icon.h
@@ -55,4 +55,3 @@ unsigned long ply_capslock_icon_get_height (ply_capslock_icon_t *capslock_icon);
 #endif
 
 #endif /* CAPSLOCK_ICON_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-entry.c b/src/libply-splash-graphics/ply-entry.c
index 5b634bd8..a434d4da 100644
--- a/src/libply-splash-graphics/ply-entry.c
+++ b/src/libply-splash-graphics/ply-entry.c
@@ -333,4 +333,3 @@ ply_entry_get_height (ply_entry_t *entry)
         return entry->area.height;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-entry.h b/src/libply-splash-graphics/ply-entry.h
index 3c03293b..2bf7b0aa 100644
--- a/src/libply-splash-graphics/ply-entry.h
+++ b/src/libply-splash-graphics/ply-entry.h
@@ -71,4 +71,3 @@ void ply_entry_set_text_color (ply_entry_t *entry,
 #endif
 
 #endif /* PLY_ENTRY_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-image.c b/src/libply-splash-graphics/ply-image.c
index 0878e568..53f850c8 100644
--- a/src/libply-splash-graphics/ply-image.c
+++ b/src/libply-splash-graphics/ply-image.c
@@ -408,4 +408,3 @@ ply_image_convert_to_pixel_buffer (ply_image_t *image)
         return buffer;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-image.h b/src/libply-splash-graphics/ply-image.h
index fc2f45f7..98b63d71 100644
--- a/src/libply-splash-graphics/ply-image.h
+++ b/src/libply-splash-graphics/ply-image.h
@@ -53,4 +53,3 @@ ply_pixel_buffer_t *ply_image_convert_to_pixel_buffer (ply_image_t *image);
 #endif
 
 #endif /* PLY_IMAGE_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-keymap-icon.c b/src/libply-splash-graphics/ply-keymap-icon.c
index 5f589d0f..94cf5b34 100644
--- a/src/libply-splash-graphics/ply-keymap-icon.c
+++ b/src/libply-splash-graphics/ply-keymap-icon.c
@@ -274,4 +274,3 @@ ply_keymap_icon_get_height (ply_keymap_icon_t *keymap_icon)
         return keymap_icon->height;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-keymap-icon.h b/src/libply-splash-graphics/ply-keymap-icon.h
index d46a5ded..c7647170 100644
--- a/src/libply-splash-graphics/ply-keymap-icon.h
+++ b/src/libply-splash-graphics/ply-keymap-icon.h
@@ -54,4 +54,3 @@ unsigned long ply_keymap_icon_get_height (ply_keymap_icon_t *keymap_icon);
 #endif
 
 #endif /* KEYMAP_ICON_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-label-plugin.h b/src/libply-splash-graphics/ply-label-plugin.h
index 75bb9d7a..a44efb39 100644
--- a/src/libply-splash-graphics/ply-label-plugin.h
+++ b/src/libply-splash-graphics/ply-label-plugin.h
@@ -71,4 +71,3 @@ typedef struct
 } ply_label_plugin_interface_t;
 
 #endif /* PLY_LABEL_PLUGIN_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-label.c b/src/libply-splash-graphics/ply-label.c
index 42d9dfb2..b1e99f0d 100644
--- a/src/libply-splash-graphics/ply-label.c
+++ b/src/libply-splash-graphics/ply-label.c
@@ -314,4 +314,3 @@ ply_label_get_height (ply_label_t *label)
 
         return label->plugin_interface->get_height_of_control (label->control);
 }
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-label.h b/src/libply-splash-graphics/ply-label.h
index 05061bbc..55debd84 100644
--- a/src/libply-splash-graphics/ply-label.h
+++ b/src/libply-splash-graphics/ply-label.h
@@ -77,4 +77,3 @@ long ply_label_get_height (ply_label_t *label);
 #endif
 
 #endif /* PLY_LABEL_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-progress-animation.c b/src/libply-splash-graphics/ply-progress-animation.c
index aebc7f6f..169c2a19 100644
--- a/src/libply-splash-graphics/ply-progress-animation.c
+++ b/src/libply-splash-graphics/ply-progress-animation.c
@@ -469,4 +469,3 @@ ply_progress_animation_get_fraction_done (ply_progress_animation_t *progress_ani
         return progress_animation->fraction_done;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-progress-animation.h b/src/libply-splash-graphics/ply-progress-animation.h
index aefe7c9b..9e235826 100644
--- a/src/libply-splash-graphics/ply-progress-animation.h
+++ b/src/libply-splash-graphics/ply-progress-animation.h
@@ -71,4 +71,3 @@ double ply_progress_animation_get_fraction_done (ply_progress_animation_t *progr
 #endif
 
 #endif /* PROGRESS_ANIMATION_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-progress-bar.c b/src/libply-splash-graphics/ply-progress-bar.c
index 5938dd6a..c7e8c925 100644
--- a/src/libply-splash-graphics/ply-progress-bar.c
+++ b/src/libply-splash-graphics/ply-progress-bar.c
@@ -202,4 +202,3 @@ ply_progress_bar_set_colors (ply_progress_bar_t *progress_bar,
         ply_progress_bar_draw (progress_bar);
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-progress-bar.h b/src/libply-splash-graphics/ply-progress-bar.h
index e7dbf57b..ecdbb464 100644
--- a/src/libply-splash-graphics/ply-progress-bar.h
+++ b/src/libply-splash-graphics/ply-progress-bar.h
@@ -66,4 +66,3 @@ void ply_progress_bar_set_colors (ply_progress_bar_t *bar,
 #endif
 
 #endif /* PLY_PROGRESS_BAR_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-throbber.c b/src/libply-splash-graphics/ply-throbber.c
index e00b50cd..ddd26aae 100644
--- a/src/libply-splash-graphics/ply-throbber.c
+++ b/src/libply-splash-graphics/ply-throbber.c
@@ -406,4 +406,3 @@ ply_throbber_get_height (ply_throbber_t *throbber)
         return throbber->height;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply-splash-graphics/ply-throbber.h b/src/libply-splash-graphics/ply-throbber.h
index 21233339..6b704408 100644
--- a/src/libply-splash-graphics/ply-throbber.h
+++ b/src/libply-splash-graphics/ply-throbber.h
@@ -60,4 +60,3 @@ long ply_throbber_get_height (ply_throbber_t *throbber);
 #endif
 
 #endif /* THROBBER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-array.c b/src/libply/ply-array.c
index c9868940..9a8fd1a9 100644
--- a/src/libply/ply-array.c
+++ b/src/libply/ply-array.c
@@ -189,4 +189,3 @@ ply_array_contains_uint32_element (ply_array_t   *array,
         return false;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-bitarray.c b/src/libply/ply-bitarray.c
index a988e920..e176ac31 100644
--- a/src/libply/ply-bitarray.c
+++ b/src/libply/ply-bitarray.c
@@ -43,4 +43,3 @@ ply_bitarray_count (ply_bitarray_t *bitarray,
         return count;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-buffer.c b/src/libply/ply-buffer.c
index 26eaaa02..7392ee6b 100644
--- a/src/libply/ply-buffer.c
+++ b/src/libply/ply-buffer.c
@@ -258,4 +258,3 @@ ply_buffer_clear (ply_buffer_t *buffer)
         buffer->size = 0;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-buffer.h b/src/libply/ply-buffer.h
index 3d848db2..e464007e 100644
--- a/src/libply/ply-buffer.h
+++ b/src/libply/ply-buffer.h
@@ -55,4 +55,3 @@ void ply_buffer_clear (ply_buffer_t *buffer);
 #endif
 
 #endif /* PLY_BUFFER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-command-parser.c b/src/libply/ply-command-parser.c
index e3f008dc..0b306b79 100644
--- a/src/libply/ply-command-parser.c
+++ b/src/libply/ply-command-parser.c
@@ -948,4 +948,3 @@ ply_command_parser_parse_arguments (ply_command_parser_t *parser,
         return parsed_arguments;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-event-loop.c b/src/libply/ply-event-loop.c
index dc4e9af4..e2cdc671 100644
--- a/src/libply/ply-event-loop.c
+++ b/src/libply/ply-event-loop.c
@@ -1322,4 +1322,3 @@ ply_event_loop_run (ply_event_loop_t *loop)
         return loop->exit_code;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-event-loop.h b/src/libply/ply-event-loop.h
index 34d0972d..eb6f1e08 100644
--- a/src/libply/ply-event-loop.h
+++ b/src/libply/ply-event-loop.h
@@ -88,4 +88,3 @@ ply_event_loop_process_pending_events (ply_event_loop_t *loop);
 #endif
 
 #endif
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-hashtable.c b/src/libply/ply-hashtable.c
index c9aa3d88..43053c17 100644
--- a/src/libply/ply-hashtable.c
+++ b/src/libply/ply-hashtable.c
@@ -275,4 +275,3 @@ ply_hashtable_get_size (ply_hashtable_t *hashtable)
         return hashtable->live_node_count;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-i18n.h b/src/libply/ply-i18n.h
index fd773830..6e4e471b 100644
--- a/src/libply/ply-i18n.h
+++ b/src/libply/ply-i18n.h
@@ -25,4 +25,3 @@
 #endif
 
 #endif /* PLY_I18N_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-key-file.c b/src/libply/ply-key-file.c
index c4de5f65..e263833e 100644
--- a/src/libply/ply-key-file.c
+++ b/src/libply/ply-key-file.c
@@ -483,4 +483,3 @@ ply_key_file_load_groupless_file (ply_key_file_t *key_file)
         return key_file->groupless_group != NULL;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-key-file.h b/src/libply/ply-key-file.h
index 668b8db9..e240363c 100644
--- a/src/libply/ply-key-file.h
+++ b/src/libply/ply-key-file.h
@@ -65,4 +65,3 @@ void ply_key_file_foreach_entry (ply_key_file_t             *key_file,
 #endif
 
 #endif /* PLY_KEY_FILE_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-list.c b/src/libply/ply-list.c
index da907934..0da7952d 100644
--- a/src/libply/ply-list.c
+++ b/src/libply/ply-list.c
@@ -360,4 +360,3 @@ ply_list_node_get_data (ply_list_node_t *node)
         return node->data;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-logger.c b/src/libply/ply-logger.c
index 7be78678..958679f3 100644
--- a/src/libply/ply-logger.c
+++ b/src/libply/ply-logger.c
@@ -594,4 +594,3 @@ ply_logger_is_tracing_to_terminal (ply_logger_t *logger)
 
 #endif /* PLY_ENABLE_TRACING */
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-logger.h b/src/libply/ply-logger.h
index 596de3c1..b2721291 100644
--- a/src/libply/ply-logger.h
+++ b/src/libply/ply-logger.h
@@ -150,4 +150,3 @@ bool ply_logger_is_tracing_to_terminal (ply_logger_t *logger);
 #endif
 
 #endif /* PLY_LOGGER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-progress.c b/src/libply/ply-progress.c
index 891301ee..8bee143e 100644
--- a/src/libply/ply-progress.c
+++ b/src/libply/ply-progress.c
@@ -327,4 +327,3 @@ ply_progress_status_update (ply_progress_t *progress,
         }
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-progress.h b/src/libply/ply-progress.h
index 1d2bce80..32e8c048 100644
--- a/src/libply/ply-progress.h
+++ b/src/libply/ply-progress.h
@@ -43,4 +43,3 @@ void ply_progress_status_update (ply_progress_t *progress,
                                  const char     *status);
 
 #endif /* PLY_PROGRESS_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-rectangle.c b/src/libply/ply-rectangle.c
index 84f3c6d2..e3e89c3e 100644
--- a/src/libply/ply-rectangle.c
+++ b/src/libply/ply-rectangle.c
@@ -260,4 +260,3 @@ ply_rectangle_intersect (ply_rectangle_t *rectangle1,
         }
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-rectangle.h b/src/libply/ply-rectangle.h
index 98bcccc0..ee2b64fd 100644
--- a/src/libply/ply-rectangle.h
+++ b/src/libply/ply-rectangle.h
@@ -106,4 +106,3 @@ void ply_rectangle_intersect (ply_rectangle_t *rectangle1,
 #endif
 
 #endif /* PLY_RECTANGLE_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-region.c b/src/libply/ply-region.c
index 5a7d556f..0e4ceea7 100644
--- a/src/libply/ply-region.c
+++ b/src/libply/ply-region.c
@@ -461,4 +461,3 @@ ply_region_get_sorted_rectangle_list (ply_region_t *region)
         return region->rectangle_list;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-region.h b/src/libply/ply-region.h
index f138b9b7..8919f244 100644
--- a/src/libply/ply-region.h
+++ b/src/libply/ply-region.h
@@ -45,4 +45,3 @@ bool ply_region_is_empty (ply_region_t *region);
 #endif
 
 #endif /* PLY_REGION_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c
index cacd3650..264dcf43 100644
--- a/src/libply/ply-terminal-session.c
+++ b/src/libply/ply-terminal-session.c
@@ -429,4 +429,3 @@ ply_terminal_session_close_log (ply_terminal_session_t *session)
         return ply_logger_close_file (session->logger);
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-terminal-session.h b/src/libply/ply-terminal-session.h
index b5538ca7..766b8b2c 100644
--- a/src/libply/ply-terminal-session.h
+++ b/src/libply/ply-terminal-session.h
@@ -71,4 +71,3 @@ void ply_terminal_session_close_log (ply_terminal_session_t *session);
 #endif
 
 #endif /* PLY_TERMINAL_SESSION_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-trigger.c b/src/libply/ply-trigger.c
index b44778d4..620fa9fb 100644
--- a/src/libply/ply-trigger.c
+++ b/src/libply/ply-trigger.c
@@ -167,4 +167,3 @@ ply_trigger_pull (ply_trigger_t *trigger,
         if (trigger->free_address != NULL)
                 ply_trigger_free (trigger);
 }
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-trigger.h b/src/libply/ply-trigger.h
index 2f3065c8..162a794c 100644
--- a/src/libply/ply-trigger.h
+++ b/src/libply/ply-trigger.h
@@ -50,4 +50,3 @@ void ply_trigger_pull (ply_trigger_t *trigger,
 #endif
 
 #endif /* PLY_TRIGGER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
index d3a4b291..c7b165e9 100644
--- a/src/libply/ply-utils.c
+++ b/src/libply/ply-utils.c
@@ -1022,4 +1022,3 @@ double ply_strtod (const char *str)
         return ret;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/libply/ply-utils.h b/src/libply/ply-utils.h
index 1b3d9d8f..62425048 100644
--- a/src/libply/ply-utils.h
+++ b/src/libply/ply-utils.h
@@ -137,4 +137,3 @@ double ply_strtod (const char *str);
 #endif
 
 #endif /* PLY_UTILS_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/main.c b/src/main.c
index e7ed5d25..3a987873 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2405,4 +2405,3 @@ main (int    argc,
 
         return exit_code;
 }
-/* vim: set ts=4 ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/controls/label/plugin.c b/src/plugins/controls/label/plugin.c
index bb239a41..3fdc4ba7 100644
--- a/src/plugins/controls/label/plugin.c
+++ b/src/plugins/controls/label/plugin.c
@@ -455,4 +455,3 @@ ply_label_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index acb53724..5796f6d2 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -1871,4 +1871,3 @@ ply_renderer_backend_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/renderers/frame-buffer/plugin.c b/src/plugins/renderers/frame-buffer/plugin.c
index 87e486a7..97dabeef 100644
--- a/src/plugins/renderers/frame-buffer/plugin.c
+++ b/src/plugins/renderers/frame-buffer/plugin.c
@@ -765,4 +765,3 @@ ply_renderer_backend_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/renderers/x11/plugin.c b/src/plugins/renderers/x11/plugin.c
index acb03ce6..d6305fcd 100644
--- a/src/plugins/renderers/x11/plugin.c
+++ b/src/plugins/renderers/x11/plugin.c
@@ -578,4 +578,3 @@ ply_renderer_backend_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/splash/details/plugin.c b/src/plugins/splash/details/plugin.c
index 2f049776..094ee58c 100644
--- a/src/plugins/splash/details/plugin.c
+++ b/src/plugins/splash/details/plugin.c
@@ -449,4 +449,3 @@ ply_boot_splash_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/splash/fade-throbber/plugin.c b/src/plugins/splash/fade-throbber/plugin.c
index 294dc6f8..64aedbdd 100644
--- a/src/plugins/splash/fade-throbber/plugin.c
+++ b/src/plugins/splash/fade-throbber/plugin.c
@@ -1104,4 +1104,3 @@ ply_boot_splash_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/splash/script/plugin.c b/src/plugins/splash/script/plugin.c
index 0b3f3f68..3395eb22 100644
--- a/src/plugins/splash/script/plugin.c
+++ b/src/plugins/splash/script/plugin.c
@@ -588,4 +588,3 @@ ply_boot_splash_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/splash/space-flares/plugin.c b/src/plugins/splash/space-flares/plugin.c
index 8b9eb134..2a942229 100644
--- a/src/plugins/splash/space-flares/plugin.c
+++ b/src/plugins/splash/space-flares/plugin.c
@@ -1861,4 +1861,3 @@ ply_boot_splash_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 3fa01a77..9f887352 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -720,4 +720,3 @@ ply_boot_splash_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/splash/tribar/plugin.c b/src/plugins/splash/tribar/plugin.c
index 7c33e184..07a0b7ec 100644
--- a/src/plugins/splash/tribar/plugin.c
+++ b/src/plugins/splash/tribar/plugin.c
@@ -726,4 +726,3 @@ ply_boot_splash_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c
index df0bd449..2ecb1780 100644
--- a/src/plugins/splash/two-step/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c
@@ -2056,4 +2056,3 @@ ply_boot_splash_plugin_get_interface (void)
         return &plugin_interface;
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/ply-boot-protocol.h b/src/ply-boot-protocol.h
index 23dfc8da..a9a92606 100644
--- a/src/ply-boot-protocol.h
+++ b/src/ply-boot-protocol.h
@@ -54,4 +54,3 @@
 #define PLY_BOOT_PROTOCOL_RESPONSE_TYPE_NO_ANSWER "\x5"
 
 #endif /* PLY_BOOT_PROTOCOL_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/ply-boot-server.c b/src/ply-boot-server.c
index 173063f7..1749a3e6 100644
--- a/src/ply-boot-server.c
+++ b/src/ply-boot-server.c
@@ -830,4 +830,3 @@ ply_boot_server_attach_to_event_loop (ply_boot_server_t *server,
                                        server);
 }
 
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/ply-boot-server.h b/src/ply-boot-server.h
index feb2bc49..48db9dd5 100644
--- a/src/ply-boot-server.h
+++ b/src/ply-boot-server.h
@@ -135,4 +135,3 @@ void ply_boot_server_attach_to_event_loop (ply_boot_server_t *server,
 #endif
 
 #endif /* PLY_BOOT_SERVER_H */
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/upstart-bridge/ply-upstart-monitor.c b/src/upstart-bridge/ply-upstart-monitor.c
index c4e748cd..bc75c49b 100644
--- a/src/upstart-bridge/ply-upstart-monitor.c
+++ b/src/upstart-bridge/ply-upstart-monitor.c
@@ -1175,4 +1175,3 @@ ply_upstart_monitor_add_failed_handler (ply_upstart_monitor_t               *mon
         monitor->failed_handler = handler;
         monitor->failed_data = user_data;
 }
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/upstart-bridge/ply-upstart-monitor.h b/src/upstart-bridge/ply-upstart-monitor.h
index be899a38..a1063e59 100644
--- a/src/upstart-bridge/ply-upstart-monitor.h
+++ b/src/upstart-bridge/ply-upstart-monitor.h
@@ -67,4 +67,3 @@ void ply_upstart_monitor_add_failed_handler (ply_upstart_monitor_t
 #endif
 
 #endif
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/upstart-bridge/plymouth-upstart-bridge.c b/src/upstart-bridge/plymouth-upstart-bridge.c
index 0a7cbc0f..b2aa769b 100644
--- a/src/upstart-bridge/plymouth-upstart-bridge.c
+++ b/src/upstart-bridge/plymouth-upstart-bridge.c
@@ -323,4 +323,3 @@ main (int    argc,
 
         return exit_code;
 }
-/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */