diff --git a/app/tests/clock_tests.c b/app/tests/clock_tests.c
index ec9d1c4f..86218dce 100644
--- a/app/tests/clock_tests.c
+++ b/app/tests/clock_tests.c
@@ -114,5 +114,3 @@ void clock_tests(void)
         printf("%u cycles per second\n", cycles);
     }
 }
-
-// vim: set noexpandtab:
diff --git a/app/tests/fibo.c b/app/tests/fibo.c
index 3f79cfcc..26f395af 100644
--- a/app/tests/fibo.c
+++ b/app/tests/fibo.c
@@ -91,6 +91,3 @@ int fibo(int argc, const cmd_args *argv)
 
     return NO_ERROR;
 }
-
-// vim: set noexpandtab:
-
diff --git a/app/tests/thread_tests.c b/app/tests/thread_tests.c
index ee589b48..72d2b7d7 100644
--- a/app/tests/thread_tests.c
+++ b/app/tests/thread_tests.c
@@ -662,5 +662,3 @@ int spinner(int argc, const cmd_args *argv)
 
     return 0;
 }
-
-/* vim: set ts=4 sw=4 noexpandtab: */
diff --git a/app/usbtest/descriptor.c b/app/usbtest/descriptor.c
index 97ebab76..0aee68e7 100644
--- a/app/usbtest/descriptor.c
+++ b/app/usbtest/descriptor.c
@@ -106,5 +106,3 @@ void usbtest_usb_setup(void)
     usbc_setup_endpoint(1, USB_OUT, 64);
     usbc_setup_endpoint(1, USB_IN, 64);
 }
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/arch/microblaze/start.S b/arch/microblaze/start.S
index 744f0d64..1a35a51b 100644
--- a/arch/microblaze/start.S
+++ b/arch/microblaze/start.S
@@ -77,6 +77,3 @@ FUNCTION(unhandled_exception)
 LOCAL_DATA(default_stack)
     .skip 4096
 LOCAL_DATA(default_stack_top)
-
-/* vim: set ts=4 sw=4 expandtab: */
-
diff --git a/dev/gpio_i2c/gpio_i2c.c b/dev/gpio_i2c/gpio_i2c.c
index 06fc71ca..7339ec5e 100644
--- a/dev/gpio_i2c/gpio_i2c.c
+++ b/dev/gpio_i2c/gpio_i2c.c
@@ -1,4 +1,3 @@
-/* vim: set expandtab ts=4 sw=4 tw=100: */
 /*
  * Copyright (c) 2013 Google Inc.
  *
diff --git a/dev/interrupt/arm_gic/arm_gic.c b/dev/interrupt/arm_gic/arm_gic.c
index 058a52c4..e3bb13ef 100644
--- a/dev/interrupt/arm_gic/arm_gic.c
+++ b/dev/interrupt/arm_gic/arm_gic.c
@@ -614,5 +614,3 @@ void sm_intc_fiq_exit(void)
     current_fiq[cpu] = 0x3ff;
 }
 #endif
-
-/* vim: set ts=4 sw=4 noexpandtab: */
diff --git a/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c b/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c
index afae0d47..b0b5e584 100644
--- a/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c
+++ b/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c
@@ -223,5 +223,3 @@ static void arm_cortex_a9_timer_init_percpu(uint level)
 LK_INIT_HOOK_FLAGS(arm_cortex_a9_timer_init_percpu,
                    arm_cortex_a9_timer_init_percpu,
                    LK_INIT_LEVEL_THREADING - 1, LK_INIT_FLAG_SECONDARY_CPUS);
-
-/* vim: set ts=4 sw=4 expandtab: */
diff --git a/dev/timer/arm_generic/arm_generic_timer.c b/dev/timer/arm_generic/arm_generic_timer.c
index a267f9ed..db267e28 100644
--- a/dev/timer/arm_generic/arm_generic_timer.c
+++ b/dev/timer/arm_generic/arm_generic_timer.c
@@ -374,5 +374,3 @@ static void arm_generic_timer_resume_cpu(uint level)
 
 LK_INIT_HOOK_FLAGS(arm_generic_timer_resume_cpu, arm_generic_timer_resume_cpu,
                    LK_INIT_LEVEL_PLATFORM, LK_INIT_FLAG_CPU_RESUME);
-
-/* vim: set noexpandtab: */
diff --git a/include/dev/gpio_i2c.h b/include/dev/gpio_i2c.h
index 32627df0..49ff571c 100644
--- a/include/dev/gpio_i2c.h
+++ b/include/dev/gpio_i2c.h
@@ -1,4 +1,3 @@
-/* vim: set expandtab ts=4 sw=4 tw=100: */
 /*
  * Copyright (c) 2013 Google Inc.
  *
diff --git a/include/kernel/thread.h b/include/kernel/thread.h
index ad28f995..1c23156a 100644
--- a/include/kernel/thread.h
+++ b/include/kernel/thread.h
@@ -239,5 +239,3 @@ extern struct thread_stats thread_stats[SMP_MAX_CPUS];
 __END_CDECLS;
 
 #endif
-
-/* vim: set ts=4 sw=4 noexpandtab: */
diff --git a/include/lk/init.h b/include/lk/init.h
index 8a34d5f4..67798581 100644
--- a/include/lk/init.h
+++ b/include/lk/init.h
@@ -86,5 +86,3 @@ struct lk_init_struct {
 
 #define LK_INIT_HOOK(_name, _hook, _level) \
     LK_INIT_HOOK_FLAGS(_name, _hook, _level, LK_INIT_FLAG_PRIMARY_CPU)
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/kernel/debug.c b/kernel/debug.c
index 3c124f9c..a121767c 100644
--- a/kernel/debug.c
+++ b/kernel/debug.c
@@ -240,5 +240,3 @@ static int cmd_kevlog(int argc, const cmd_args *argv)
 #endif
 
 #endif // WITH_KERNEL_EVLOG
-
-// vim: set noexpandtab:
diff --git a/kernel/mp.c b/kernel/mp.c
index 928fbb3c..bb804ae7 100644
--- a/kernel/mp.c
+++ b/kernel/mp.c
@@ -76,6 +76,3 @@ enum handler_return mp_mbx_reschedule_irq(void)
     return (mp.active_cpus & (1U << cpu)) ? INT_RESCHEDULE : INT_NO_RESCHEDULE;
 }
 #endif
-
-// vim: set noexpandtab:
-
diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index 3fc962f6..51650e0a 100644
--- a/kernel/semaphore.c
+++ b/kernel/semaphore.c
@@ -97,5 +97,3 @@ status_t sem_timedwait(semaphore_t *sem, lk_time_t timeout)
     THREAD_UNLOCK(state);
     return ret;
 }
-
-/* vim: set noexpandtab: */
diff --git a/kernel/thread.c b/kernel/thread.c
index 10225bbb..e5727099 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -1270,5 +1270,3 @@ const struct __debugger_info__ {
     .off_waitq = __builtin_offsetof(thread_t, blocking_wait_queue),
 };
 #endif
-
-/* vim: set ts=4 sw=4 noexpandtab: */
diff --git a/kernel/timer.c b/kernel/timer.c
index 6f110c7f..a013bde5 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -309,6 +309,3 @@ void timer_init(void)
     platform_set_periodic_timer(timer_tick, NULL, 10); /* 10ms */
 #endif
 }
-
-/* vim: set noexpandtab */
-
diff --git a/lib/cksum/debug.c b/lib/cksum/debug.c
index ffeb465f..aec43295 100644
--- a/lib/cksum/debug.c
+++ b/lib/cksum/debug.c
@@ -141,5 +141,3 @@ static int cmd_cksum_bench(int argc, const cmd_args *argv)
 }
 
 #endif // WITH_LIB_CONSOLE
-
-// vim: set noexpandtab:
diff --git a/lib/gfx/gfx.c b/lib/gfx/gfx.c
index 2b0f1a3b..3e614c01 100644
--- a/lib/gfx/gfx.c
+++ b/lib/gfx/gfx.c
@@ -821,5 +821,3 @@ static int cmd_gfx(int argc, const cmd_args *argv)
 
 #endif
 #endif
-
-// vim: set noexpandtab:
diff --git a/lib/gfxconsole/gfxconsole.c b/lib/gfxconsole/gfxconsole.c
index e2d1054f..97fd820e 100644
--- a/lib/gfxconsole/gfxconsole.c
+++ b/lib/gfxconsole/gfxconsole.c
@@ -178,5 +178,3 @@ static void gfxconsole_init_hook(uint level)
 }
 
 LK_INIT_HOOK(gfxconsole, &gfxconsole_init_hook, LK_INIT_LEVEL_PLATFORM);
-
-// vim: set noexpandtab:
diff --git a/lib/iovec/iovec.c b/lib/iovec/iovec.c
index a01bc0b9..47f89334 100644
--- a/lib/iovec/iovec.c
+++ b/lib/iovec/iovec.c
@@ -87,6 +87,3 @@ ssize_t iovec_to_membuf (uint8_t *buf, uint buf_len, const iovec_t *iov, uint io
 
     return (ssize_t) buf_pos;
 }
-
-
-// vim: set ts=4 sw=4 noexpandtab:
diff --git a/lib/minip/arp.c b/lib/minip/arp.c
index b1648b5f..be20caea 100644
--- a/lib/minip/arp.c
+++ b/lib/minip/arp.c
@@ -202,6 +202,3 @@ const uint8_t *arp_get_dest_mac(uint32_t host)
 
     return dst_mac;
 }
-
-// vim: set ts=4 sw=4 expandtab:
-
diff --git a/lib/minip/chksum.c b/lib/minip/chksum.c
index ed68f7bf..8f7c8f8f 100644
--- a/lib/minip/chksum.c
+++ b/lib/minip/chksum.c
@@ -96,5 +96,3 @@ uint16_t rfc768_chksum(struct ipv4_hdr *ipv4, struct udp_hdr *udp)
     return chksum;
 }
 #endif
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/lib/minip/dhcp.c b/lib/minip/dhcp.c
index 89fad018..95e311b9 100644
--- a/lib/minip/dhcp.c
+++ b/lib/minip/dhcp.c
@@ -298,5 +298,3 @@ void minip_init_dhcp(tx_func_t tx_func, void *tx_arg)
     dhcp_thr = thread_create("dhcp", dhcp_thread, NULL, DEFAULT_PRIORITY, DEFAULT_STACK_SIZE);
     thread_detach_and_resume(dhcp_thr);
 }
-
-// vim: set noexpandtab:
diff --git a/lib/minip/include/lib/minip.h b/lib/minip/include/lib/minip.h
index edd33401..715f8c36 100644
--- a/lib/minip/include/lib/minip.h
+++ b/lib/minip/include/lib/minip.h
@@ -86,5 +86,3 @@ static inline status_t tcp_accept(tcp_socket_t *listen_socket, tcp_socket_t **ac
 
 /* utilities */
 void gen_random_mac_address(uint8_t *mac_addr);
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/lib/minip/include/lib/pktbuf.h b/lib/minip/include/lib/pktbuf.h
index d1334c03..99e36c50 100644
--- a/lib/minip/include/lib/pktbuf.h
+++ b/lib/minip/include/lib/pktbuf.h
@@ -125,5 +125,3 @@ void pktbuf_create_bufs(void *ptr, size_t size);
 
 void pktbuf_dump(pktbuf_t *p);
 #endif
-
-// vim: set noexpandtab:
diff --git a/lib/minip/lk_console.c b/lib/minip/lk_console.c
index 005db624..679fb84b 100644
--- a/lib/minip/lk_console.c
+++ b/lib/minip/lk_console.c
@@ -170,5 +170,3 @@ STATIC_COMMAND("arp", "arp commands", &cmd_arp)
 STATIC_COMMAND("mi", "minip commands", &cmd_minip)
 STATIC_COMMAND_END(minip);
 #endif
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/lib/minip/minip-internal.h b/lib/minip/minip-internal.h
index 5eeedc09..b7528dee 100644
--- a/lib/minip/minip-internal.h
+++ b/lib/minip/minip-internal.h
@@ -151,6 +151,3 @@ static inline void mac_addr_copy(uint8_t *dest, const uint8_t *src)
     *(uint32_t *)dest = *(const uint32_t *)src;
     *(uint16_t *)(dest + 4) = *(const uint16_t *)(src + 4);
 }
-
-// vim: set ts=4 sw=4 expandtab:
-
diff --git a/lib/minip/minip.c b/lib/minip/minip.c
index be43b8a9..ffedef25 100644
--- a/lib/minip/minip.c
+++ b/lib/minip/minip.c
@@ -499,5 +499,3 @@ uint32_t minip_parse_ipaddr(const char *ipaddr_str, size_t len)
 
     return IPV4_PACK(ip);
 }
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/lib/minip/pktbuf.c b/lib/minip/pktbuf.c
index b7b34fbd..edadf497 100644
--- a/lib/minip/pktbuf.c
+++ b/lib/minip/pktbuf.c
@@ -248,5 +248,3 @@ static void pktbuf_init(uint level)
 }
 
 LK_INIT_HOOK(pktbuf, pktbuf_init, LK_INIT_LEVEL_THREADING);
-
-// vim: set noexpandtab:
diff --git a/lib/minip/tcp.c b/lib/minip/tcp.c
index ffdb13a1..6f0ffbdf 100644
--- a/lib/minip/tcp.c
+++ b/lib/minip/tcp.c
@@ -1311,5 +1311,3 @@ STATIC_COMMAND_START
 STATIC_COMMAND("tcp", "tcp commands", &cmd_tcp)
 STATIC_COMMAND_END(tcp);
 
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/platform/pc/interrupts.c b/platform/pc/interrupts.c
index dc2869b9..073586ad 100755
--- a/platform/pc/interrupts.c
+++ b/platform/pc/interrupts.c
@@ -269,6 +269,3 @@ void register_int_handler(unsigned int vector, int_handler handler, void *arg)
 
     spin_unlock_irqrestore(&lock, state);
 }
-
-/* vim: set noexpandtab: */
-
diff --git a/platform/pc/platform.c b/platform/pc/platform.c
index d97190c2..d0e6b64d 100644
--- a/platform/pc/platform.c
+++ b/platform/pc/platform.c
@@ -246,5 +246,3 @@ void platform_init(void)
     arch_mmu_init();
     platform_init_mmu_mappings();
 }
-
-/* vim: set noexpandtab: */
diff --git a/platform/pc/timer.c b/platform/pc/timer.c
index 06f329b8..47b29bb5 100644
--- a/platform/pc/timer.c
+++ b/platform/pc/timer.c
@@ -209,5 +209,3 @@ void platform_stop_timer(void)
     outp(I8253_CONTROL_REG, 0x30);
     return;
 }
-
-/* vim: set noexpandtab */
diff --git a/platform/stellaris/init.c b/platform/stellaris/init.c
index 9f24e3f6..3537a4b1 100644
--- a/platform/stellaris/init.c
+++ b/platform/stellaris/init.c
@@ -90,5 +90,3 @@ void platform_init(void)
     printf("\n");
 
 }
-
-// vim: set ts=4 sw=4 noexpandtab:
diff --git a/platform/stellaris/usbc.c b/platform/stellaris/usbc.c
index 3ffd7268..04ca2883 100644
--- a/platform/stellaris/usbc.c
+++ b/platform/stellaris/usbc.c
@@ -250,5 +250,3 @@ status_t usbc_queue_tx(ep_t ep, usbc_transfer_t *transfer)
 {
     PANIC_UNIMPLEMENTED;
 }
-
-// vim: set ts=4 sw=4 noexpandtab:
diff --git a/platform/stellaris/vectab.c b/platform/stellaris/vectab.c
index 53c47878..06c8c7cd 100644
--- a/platform/stellaris/vectab.c
+++ b/platform/stellaris/vectab.c
@@ -297,5 +297,3 @@ const void *const __SECTION(".text.boot.vectab2") vectab2[] = {
     VECTAB_ENTRY(pwm1_gen3),                // PWM 1 Generator 3
     VECTAB_ENTRY(pwm1_fault)                // PWM 1 Fault
 };
-
-// vim: ts=4 sw=4 noexpandtab:
diff --git a/platform/stm32f4xx/flash.c b/platform/stm32f4xx/flash.c
index 70ab4970..60fbd80f 100644
--- a/platform/stm32f4xx/flash.c
+++ b/platform/stm32f4xx/flash.c
@@ -167,5 +167,3 @@ static int stmflash_ioctl(struct bdev *bdev, int request, void *argp)
     LTRACEF("dev %p, request %d, argp %p\n",bdev, request, argp);
     return ERR_NOT_SUPPORTED;
 }
-
-// vim: set ts=4 sw=4 noexpandtab:
diff --git a/platform/zynq/qspi.c b/platform/zynq/qspi.c
index d8609bb0..77010526 100644
--- a/platform/zynq/qspi.c
+++ b/platform/zynq/qspi.c
@@ -378,6 +378,3 @@ uint32_t qspi_rd1(struct qspi_ctxt *qspi, uint32_t cmd)
     qspi_cs(qspi, 1);
     return readl(QSPI_RXDATA);
 }
-
-// vim: set ts=4 sw=4 noexpandtab:
-
diff --git a/platform/zynq/spiflash.c b/platform/zynq/spiflash.c
index 6a5a8829..1690fee5 100644
--- a/platform/zynq/spiflash.c
+++ b/platform/zynq/spiflash.c
@@ -578,5 +578,3 @@ STATIC_COMMAND("spiflash", "spi flash manipulation utilities", cmd_spiflash)
 STATIC_COMMAND_END(qspi);
 
 #endif
-
-// vim: set ts=4 sw=4 noexpandtab:
diff --git a/platform/zynq/timer.c b/platform/zynq/timer.c
index f983c968..17c1359f 100644
--- a/platform/zynq/timer.c
+++ b/platform/zynq/timer.c
@@ -130,5 +130,3 @@ void platform_init_timer(void)
     register_int_handler(TTC0_C_INT, &platform_tick, NULL);
 }
 #endif
-
-/* vim: set ts=4 sw=4 expandtab: */
diff --git a/target/stellaris-launchpad/init.c b/target/stellaris-launchpad/init.c
index 0fcda421..9b29b3e9 100644
--- a/target/stellaris-launchpad/init.c
+++ b/target/stellaris-launchpad/init.c
@@ -64,5 +64,3 @@ void target_set_debug_led(unsigned int led, bool on)
             break;
     }
 }
-
-// vim: set ts=4 sw=4 noexpandtab:
diff --git a/target/stellaris-launchpad/usb.c b/target/stellaris-launchpad/usb.c
index cce349b6..78362e81 100644
--- a/target/stellaris-launchpad/usb.c
+++ b/target/stellaris-launchpad/usb.c
@@ -128,5 +128,3 @@ void target_usb_setup(void)
 
     usb_start();
 }
-
-// vim: set ts=4 sw=4 expandtab:
diff --git a/tools/liblkboot.c b/tools/liblkboot.c
index 6692ed7c..056cf480 100644
--- a/tools/liblkboot.c
+++ b/tools/liblkboot.c
@@ -321,5 +321,3 @@ out:
         close(fd_out);
     return ret;
 }
-
-// vim: noexpandtab
diff --git a/tools/lkboot.c b/tools/lkboot.c
index 91ff6cfb..d677525c 100644
--- a/tools/lkboot.c
+++ b/tools/lkboot.c
@@ -122,5 +122,3 @@ int main(int argc, char **argv)
     }
     return lkboot_txn(host, cmd, fd, args);
 }
-
-// vim: noexpandtab
diff --git a/tools/mkimage.c b/tools/mkimage.c
index e640312c..6277bd19 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -148,5 +148,3 @@ int main(int argc, char **argv)
     close(fd);
     return 0;
 }
-
-// vim: set noexpandtab:
diff --git a/tools/network.c b/tools/network.c
index 33d9876c..19c8972b 100644
--- a/tools/network.c
+++ b/tools/network.c
@@ -125,5 +125,3 @@ int tcp_connect(in_addr_t addr, unsigned port)
 {
     return inet_connect(addr, SOCK_STREAM, port);
 }
-
-// vim: noexpandtab