diff --git a/include/empthread.h b/include/empthread.h
index 1e5709fa..217efeb5 100644
--- a/include/empthread.h
+++ b/include/empthread.h
@@ -102,9 +102,8 @@ typedef struct {
 #define EMPTH_PRINT       0x1
 #define EMPTH_STACKCHECK  0x2
 
-typedef void empth_t;
-
-typedef void empth_sem_t;
+typedef struct loc_Thread_t empth_t;
+typedef struct loc_Sem_t void empth_sem_t;
 
 #endif
 
diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c
index 3d827e4c..d2b73fe3 100644
--- a/src/lib/empthread/ntthread.c
+++ b/src/lib/empthread/ntthread.c
@@ -68,7 +68,7 @@
  * The external world only gets
  * a void pointer to this.
  */
-typedef struct {
+typedef struct loc_Thread_t {
 
     /* The thread name, passed in at create time. */
     char szName[17];
@@ -102,7 +102,7 @@ typedef struct {
  * The external world only gets
  * a void pointer to this.
  */
-typedef struct {
+typedef struct empth_sem_t {
 
     char szName[17];