diff --git a/extras/timekeeping/timekeeping.c b/extras/timekeeping/timekeeping.c
index d60b364..1fb65fd 100644
--- a/extras/timekeeping/timekeeping.c
+++ b/extras/timekeeping/timekeeping.c
@@ -46,8 +46,6 @@
 
 #include <time.h>
 
-#include "timekeeping.h"
-
 
 /* #define here for easier use of other system clocks */
 #define GET_SYSTEM_CLOCK_US() sdk_system_get_time()
@@ -113,7 +111,7 @@ extern void __tz_unlock(void);
 
 #ifdef TIMEKEEPING_LOCK_USE_CRITICAL
 #define TIMEKEEPING_LOCK()   do {TZ_LOCK; taskENTER_CRITICAL();} while (0)
-#define TIMEKEEPING_UNLOCK() do {TZ_UNLOCK; taskEXIT_CRITICAL();} while (0)
+#define TIMEKEEPING_UNLOCK() do {taskEXIT_CRITICAL(); TZ_UNLOCK;} while (0)
 #else
 #define TIMEKEEPING_LOCK()   TZ_LOCK
 #define TIMEKEEPING_UNLOCK() TZ_UNLOCK
diff --git a/extras/timekeeping/timekeeping.h b/extras/timekeeping/timekeeping.h
deleted file mode 100644
index 9fe150d..0000000
--- a/extras/timekeeping/timekeeping.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Basic timekeeping functions
- * 
- * Independent of clock discipline
- */
-
-/*-
- * Copyright (c) 2018, Jeff Kletsky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *
- *     * Neither the name of the copyright holder nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef EXTRAS_TIMEKEEPING_TIMEKEEPING_H
-#define EXTRAS_TIMEKEEPING_TIMEKEEPING_H
-
-/* No implementation-specific declarations */
-
-/* Public API already defined by
-#include <sys/time.h>
-#include <time.h>
-#include <stdlib.h>
- */
-
-#endif /* EXTRAS_TIMEKEEPING_TIMEKEEPING_H */