diff --git a/hal/include/HAL/AnalogOutput.h b/hal/include/HAL/AnalogOutput.h
index 298d48d84d..fb89c63f81 100644
--- a/hal/include/HAL/AnalogOutput.h
+++ b/hal/include/HAL/AnalogOutput.h
@@ -11,8 +11,6 @@
 
 #include "Handles.h"
 
-typedef HalHandle HalAnalogOutputHandle;
-
 extern "C" {
 HalAnalogOutputHandle initializeAnalogOutputPort(HalPortHandle port_handle,
                                                  int32_t* status);
diff --git a/hal/include/HAL/Handles.h b/hal/include/HAL/Handles.h
index 5e0b783851..18de01185e 100644
--- a/hal/include/HAL/Handles.h
+++ b/hal/include/HAL/Handles.h
@@ -14,3 +14,9 @@
 typedef int32_t HalHandle;
 
 typedef HalHandle HalPortHandle;
+
+typedef HalHandle HalInterruptHandle;
+
+typedef HalHandle HalNotifierHandle;
+
+typedef HalHandle HalAnalogOutputHandle;
diff --git a/hal/include/HAL/Interrupts.h b/hal/include/HAL/Interrupts.h
index ea845eeb0e..abd54f3485 100644
--- a/hal/include/HAL/Interrupts.h
+++ b/hal/include/HAL/Interrupts.h
@@ -11,8 +11,6 @@
 
 #include "Handles.h"
 
-typedef HalHandle HalInterruptHandle;
-
 extern "C" {
 typedef void (*InterruptHandlerFunction)(uint32_t interruptAssertedMask,
                                          void* param);
diff --git a/hal/include/HAL/Notifier.h b/hal/include/HAL/Notifier.h
index 74f0686f29..66d0ac5a69 100644
--- a/hal/include/HAL/Notifier.h
+++ b/hal/include/HAL/Notifier.h
@@ -11,8 +11,6 @@
 
 #include "Handles.h"
 
-typedef HalHandle HalNotifierHandle;
-
 extern "C" {
 HalNotifierHandle initializeNotifier(void (*process)(uint64_t, void*),
                                      void* param, int32_t* status);