diff --git a/arch/arm/include/arch/arch_ops.h b/arch/arm/include/arch/arch_ops.h
index 54db01a4..879565cd 100644
--- a/arch/arm/include/arch/arch_ops.h
+++ b/arch/arm/include/arch/arch_ops.h
@@ -33,7 +33,7 @@
 #include <arch/arm/cm.h>
 #endif
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #if ARM_ISA_ARMV7 || (ARM_ISA_ARMV6 && !__thumb__)
 #define USE_GCC_ATOMICS 0
@@ -471,6 +471,6 @@ static inline uint32_t arch_cycle_count(void) { return _arch_cycle_count(); }
 #define smp_rmb()   CF
 #endif
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif // ASSEMBLY
diff --git a/arch/arm/include/arch/spinlock.h b/arch/arm/include/arch/spinlock.h
index d2fb527d..01382a6d 100644
--- a/arch/arm/include/arch/spinlock.h
+++ b/arch/arm/include/arch/spinlock.h
@@ -26,7 +26,7 @@
 #include <arch/ops.h>
 #include <stdbool.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define SPIN_LOCK_INITIAL_VALUE (0)
 
@@ -108,4 +108,4 @@ arch_interrupt_restore(spin_lock_saved_state_t old_state, spin_lock_save_flags_t
         arch_enable_ints();
 }
 
-__END_CDECLS;
+__END_CDECLS
diff --git a/include/app.h b/include/app.h
index bdc9386c..88cca4eb 100644
--- a/include/app.h
+++ b/include/app.h
@@ -26,7 +26,7 @@
 #include <stddef.h>
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 /* app support api */
 void apps_init(void); /* one time setup */
@@ -53,7 +53,7 @@ struct app_descriptor {
 
 #define APP_END };
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/include/bits.h b/include/bits.h
index e7179b09..18f8448e 100644
--- a/include/bits.h
+++ b/include/bits.h
@@ -26,7 +26,7 @@
 #include <compiler.h>
 #include <arch/ops.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define clz(x) __builtin_clz(x)
 #define ctz(x) __builtin_ctz(x)
@@ -88,6 +88,6 @@ static inline int bitmap_ffz(unsigned long *bitmap, int numbits)
     return -1;
 }
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
diff --git a/include/kernel/debug.h b/include/kernel/debug.h
index 4aaec9ee..4c2b20d6 100644
--- a/include/kernel/debug.h
+++ b/include/kernel/debug.h
@@ -25,7 +25,7 @@
 
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #include <debug.h>
 
@@ -69,7 +69,7 @@ enum {
 #define KEVLOG_IRQ_ENTER(irqn) kernel_evlog_add(KERNEL_EVLOG_IRQ_ENTER, (uintptr_t)irqn, 0)
 #define KEVLOG_IRQ_EXIT(irqn) kernel_evlog_add(KERNEL_EVLOG_IRQ_EXIT, (uintptr_t)irqn, 0)
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/include/kernel/event.h b/include/kernel/event.h
index 7da5c157..3e214e79 100644
--- a/include/kernel/event.h
+++ b/include/kernel/event.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <kernel/thread.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define EVENT_MAGIC (0x65766E74)  // "evnt"
 
@@ -81,7 +81,7 @@ static inline status_t event_wait(event_t *e)
     return event_wait_timeout(e, INFINITE_TIME);
 }
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/include/kernel/mp.h b/include/kernel/mp.h
index bdad0264..d4ae3d45 100644
--- a/include/kernel/mp.h
+++ b/include/kernel/mp.h
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <kernel/thread.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 typedef uint32_t mp_cpu_mask_t;
 
@@ -126,4 +126,4 @@ static inline void mp_set_cpu_non_realtime(uint cpu) {}
 static inline mp_cpu_mask_t mp_get_realtime_mask(void) { return 0; }
 #endif
 
-__END_CDECLS;
+__END_CDECLS
diff --git a/include/kernel/mutex.h b/include/kernel/mutex.h
index 1adfa47a..63273396 100644
--- a/include/kernel/mutex.h
+++ b/include/kernel/mutex.h
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <kernel/thread.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define MUTEX_MAGIC (0x6D757478)  // 'mutx'
 
@@ -69,6 +69,6 @@ static bool is_mutex_held(mutex_t *m)
     return m->holder == get_current_thread();
 }
 
-__END_CDECLS;
+__END_CDECLS
 #endif
 
diff --git a/include/kernel/port.h b/include/kernel/port.h
index bf1714ab..6f0d3c43 100644
--- a/include/kernel/port.h
+++ b/include/kernel/port.h
@@ -27,7 +27,7 @@
 #include <compiler.h>
 
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 /* Ports are named, opaque objects and come in three flavors, the
  * write-side, the read-side and a port group which is a collection
@@ -103,7 +103,7 @@ status_t port_destroy(port_t port);
  */
 status_t port_close(port_t port);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/include/kernel/semaphore.h b/include/kernel/semaphore.h
index 48c6c606..1f979545 100644
--- a/include/kernel/semaphore.h
+++ b/include/kernel/semaphore.h
@@ -21,7 +21,7 @@
 #include <kernel/thread.h>
 #include <kernel/mutex.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define SEMAPHORE_MAGIC (0x73656D61) // 'sema'
 
@@ -45,5 +45,5 @@ status_t sem_wait(semaphore_t *);
 status_t sem_trywait(semaphore_t *);
 status_t sem_timedwait(semaphore_t *, lk_time_t);
 
-__END_CDECLS;
+__END_CDECLS
 #endif
diff --git a/include/kernel/thread.h b/include/kernel/thread.h
index 5ab4513e..4c40bde3 100644
--- a/include/kernel/thread.h
+++ b/include/kernel/thread.h
@@ -38,7 +38,7 @@
 typedef struct vmm_aspace vmm_aspace_t;
 #endif
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 /* debug-enable runtime checks */
 #if LK_DEBUGLEVEL > 1
@@ -250,6 +250,6 @@ extern struct thread_stats thread_stats[SMP_MAX_CPUS];
 
 #endif
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
diff --git a/include/kernel/timer.h b/include/kernel/timer.h
index 3f59a0f4..48a73d93 100644
--- a/include/kernel/timer.h
+++ b/include/kernel/timer.h
@@ -27,7 +27,7 @@
 #include <list.h>
 #include <sys/types.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 void timer_init(void);
 
@@ -68,7 +68,7 @@ void timer_set_oneshot(timer_t *, lk_time_t delay, timer_callback, void *arg);
 void timer_set_periodic(timer_t *, lk_time_t period, timer_callback, void *arg);
 void timer_cancel(timer_t *);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/include/kernel/wait.h b/include/kernel/wait.h
index 5fe79981..69cc65c5 100644
--- a/include/kernel/wait.h
+++ b/include/kernel/wait.h
@@ -30,7 +30,7 @@
 #include <arch/ops.h>
 #include <arch/thread.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 /* wait queue stuff */
 #define WAIT_QUEUE_MAGIC (0x77616974) // 'wait'
@@ -81,7 +81,7 @@ int wait_queue_wake_all(wait_queue_t *, bool reschedule, status_t wait_queue_err
  */
 status_t thread_unblock_from_wait_queue(struct thread *t, status_t wait_queue_error);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/include/lib/page_alloc.h b/include/lib/page_alloc.h
index 41b8d6e8..1124a6bf 100644
--- a/include/lib/page_alloc.h
+++ b/include/lib/page_alloc.h
@@ -40,7 +40,7 @@
  * specific apis.
  */
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define PAGE_ALLOC_ANY_ARENA (-1)
 
@@ -64,6 +64,6 @@ int page_get_arenas(struct page_range* ranges, int number_of_ranges);
 // will return some non-page-aligned memory that would otherwise go to waste.
 void *page_first_alloc(size_t *size_return);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
diff --git a/include/list.h b/include/list.h
index 129f8056..ccf946f0 100644
--- a/include/list.h
+++ b/include/list.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define containerof(ptr, type, member) \
     ((type *)((addr_t)(ptr) - offsetof(type, member)))
@@ -282,6 +282,6 @@ static inline size_t list_length(struct list_node *list)
     return cnt;
 }
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
diff --git a/include/platform.h b/include/platform.h
index 19ff3016..8e8f6777 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 typedef enum {
     HALT_ACTION_HALT = 0,       // Spin forever.
@@ -84,6 +84,6 @@ void platform_halt(platform_halt_action suggested_action,
 /* called during chain loading to make sure drivers and platform is put into a stopped state */
 void platform_quiesce(void);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
diff --git a/include/pow2.h b/include/pow2.h
index 23d4f1b2..9cdf87be 100644
--- a/include/pow2.h
+++ b/include/pow2.h
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 /* routines for dealing with power of 2 values for efficiency */
 static inline __ALWAYS_INLINE bool ispow2(uint val)
@@ -72,7 +72,7 @@ static inline __ALWAYS_INLINE uint32_t round_up_pow2_u32(uint32_t v)
     v++;
     return v;
 }
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/include/target.h b/include/target.h
index 91e0f245..80726418 100644
--- a/include/target.h
+++ b/include/target.h
@@ -26,7 +26,7 @@
 #include <compiler.h>
 #include <stdbool.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 /* super early platform initialization, before almost everything */
 void target_early_init(void);
@@ -46,6 +46,6 @@ void target_set_debug_led(unsigned int led, bool on);
 #define target_set_debug_led(led, on) ((void)(0))
 #endif
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
diff --git a/lib/bio/include/lib/bio.h b/lib/bio/include/lib/bio.h
index 20f0e09d..c92ad140 100644
--- a/lib/bio/include/lib/bio.h
+++ b/lib/bio/include/lib/bio.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <list.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 #define BIO_FLAGS_NONE                (0 << 0)
 #define BIO_FLAG_CACHE_ALIGNED_READS  (1 << 0)
@@ -147,4 +147,4 @@ enum bio_ioctl_num {
     BIO_IOCTL_IS_MAPPED,    /* if supported, returns whether or not the device is memory mapped. */
 };
 
-__END_CDECLS;
\ No newline at end of file
+__END_CDECLS
\ No newline at end of file
diff --git a/lib/fs/include/lib/fs.h b/lib/fs/include/lib/fs.h
index 32c3fe2c..f4f070ad 100644
--- a/lib/fs/include/lib/fs.h
+++ b/lib/fs/include/lib/fs.h
@@ -29,7 +29,7 @@
 #define FS_MAX_PATH_LEN 128
 #define FS_MAX_FILE_LEN 64
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 // Generic FS ioctls
 enum fs_ioctl_num {
diff --git a/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h b/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
index 11a40108..7026ca6f 100644
--- a/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
+++ b/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
@@ -24,7 +24,7 @@
 
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 void *cmpct_alloc(size_t);
 void *cmpct_realloc(void *, size_t);
@@ -36,4 +36,4 @@ void cmpct_dump(void);
 void cmpct_test(void);
 void cmpct_trim(void);
 
-__END_CDECLS;
+__END_CDECLS
diff --git a/lib/heap/include/lib/heap.h b/lib/heap/include/lib/heap.h
index 48693e46..470dd879 100644
--- a/lib/heap/include/lib/heap.h
+++ b/lib/heap/include/lib/heap.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 /* standard heap definitions */
 void *malloc(size_t size) __MALLOC;
@@ -43,4 +43,4 @@ void heap_delayed_free(void *);
 /* tell the heap to return any free pages it can find */
 void heap_trim(void);
 
-__END_CDECLS;
+__END_CDECLS
diff --git a/lib/heap/miniheap/include/lib/miniheap.h b/lib/heap/miniheap/include/lib/miniheap.h
index ff91f3eb..d3950404 100644
--- a/lib/heap/miniheap/include/lib/miniheap.h
+++ b/lib/heap/miniheap/include/lib/miniheap.h
@@ -24,7 +24,7 @@
 
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 struct miniheap_stats {
     void *heap_start;
@@ -44,4 +44,4 @@ void miniheap_init(void *ptr, size_t len);
 void miniheap_dump(void);
 void miniheap_trim(void);
 
-__END_CDECLS;
+__END_CDECLS
diff --git a/lib/libc/include/ctype.h b/lib/libc/include/ctype.h
index c330e681..b80f4cef 100644
--- a/lib/libc/include/ctype.h
+++ b/lib/libc/include/ctype.h
@@ -25,7 +25,7 @@
 
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 int isalnum(int c);
 int isalpha(int c);
@@ -43,7 +43,7 @@ int isxdigit(int c);
 int tolower(int c);
 int toupper(int c);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/lib/libc/include/iovec.h b/lib/libc/include/iovec.h
index 9414bc65..a2777859 100644
--- a/lib/libc/include/iovec.h
+++ b/lib/libc/include/iovec.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 typedef struct iovec {
     void *iov_base;
@@ -39,7 +39,7 @@ ssize_t iovec_size(const iovec_t *iov, uint iov_cnt);
 ssize_t iovec_to_membuf(uint8_t *buf, uint buf_len,
                         const iovec_t *iov, uint iov_cnt, uint iov_pos);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/lib/libc/include/rand.h b/lib/libc/include/rand.h
index a313041f..93c424d0 100644
--- a/lib/libc/include/rand.h
+++ b/lib/libc/include/rand.h
@@ -26,7 +26,7 @@
 #include <compiler.h>
 #include <sys/types.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 int rand(void);
 void srand(unsigned int seed);
@@ -34,7 +34,7 @@ void srand(unsigned int seed);
 /* non standard extension to add some entropy to the seed */
 void rand_add_entropy(const void *buf, size_t len);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/lib/libc/include/stdlib.h b/lib/libc/include/stdlib.h
index f8f84140..1ff00b5d 100644
--- a/lib/libc/include/stdlib.h
+++ b/lib/libc/include/stdlib.h
@@ -31,7 +31,7 @@
 #include <rand.h>
 #include <arch/defines.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 int atoi(const char *num);
 unsigned int atoui(const char *num);
@@ -61,7 +61,7 @@ void *bsearch(const void *key, const void *base, size_t num_elems, size_t size,
 unsigned long int strtoul(const char *nptr, char **endptr, int base);
 char *getenv(const char *name);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif
 
diff --git a/lib/libc/include/strings.h b/lib/libc/include/strings.h
index ea890cfd..1cc76044 100644
--- a/lib/libc/include/strings.h
+++ b/lib/libc/include/strings.h
@@ -3,10 +3,10 @@
 
 #include <compiler.h>
 
-__BEGIN_CDECLS;
+__BEGIN_CDECLS
 
 int strcasecmp(const char *s1, const char *s2);
 
-__END_CDECLS;
+__END_CDECLS
 
 #endif  /* !__STRINGS_H */