diff --git a/right/src/i2c_watchdog.c b/right/src/i2c_watchdog.c
index bad9842..954e19e 100644
--- a/right/src/i2c_watchdog.c
+++ b/right/src/i2c_watchdog.c
@@ -30,7 +30,7 @@ void PIT_I2C_WATCHDOG_HANDLER(void)
 
     prevWatchdogCounter = I2C_Watchdog;
 
-    PIT_ClearStatusFlags(PIT, kPIT_Chnl_0, PIT_TFLG_TIF_MASK);
+    PIT_ClearStatusFlags(PIT, PIT_I2C_WATCHDOG_CHANNEL, PIT_TFLG_TIF_MASK);
 }
 
 void InitI2cWatchdog(void)
@@ -38,8 +38,8 @@ void InitI2cWatchdog(void)
     pit_config_t pitConfig;
     PIT_GetDefaultConfig(&pitConfig);
     PIT_Init(PIT, &pitConfig);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_0, USEC_TO_COUNT(I2C_WATCHDOG_INTERVAL_USEC, PIT_SOURCE_CLOCK));
-    PIT_EnableInterrupts(PIT, kPIT_Chnl_0, kPIT_TimerInterruptEnable);
+    PIT_SetTimerPeriod(PIT, PIT_I2C_WATCHDOG_CHANNEL, USEC_TO_COUNT(I2C_WATCHDOG_INTERVAL_USEC, PIT_SOURCE_CLOCK));
+    PIT_EnableInterrupts(PIT, PIT_I2C_WATCHDOG_CHANNEL, kPIT_TimerInterruptEnable);
     EnableIRQ(PIT_I2C_WATCHDOG_IRQ_ID);
-    PIT_StartTimer(PIT, kPIT_Chnl_0);
+    PIT_StartTimer(PIT, PIT_I2C_WATCHDOG_CHANNEL);
 }
diff --git a/right/src/i2c_watchdog.h b/right/src/i2c_watchdog.h
index 3161bb1..aff1fb6 100644
--- a/right/src/i2c_watchdog.h
+++ b/right/src/i2c_watchdog.h
@@ -1,14 +1,14 @@
 #ifndef __I2C_WATCHDOG_H__
 #define __I2C_WATCHDOG_H__
 
+// Includes:
+
+    #include "peripherals/pit.h"
+
 // Macros:
 
     #define I2C_WATCHDOG_INTERVAL_USEC 100000
 
-    #define PIT_I2C_WATCHDOG_HANDLER PIT0_IRQHandler
-    #define PIT_I2C_WATCHDOG_IRQ_ID PIT0_IRQn
-    #define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_BusClk)
-
 // Variables:
 
     extern uint32_t I2cWatchdog_RecoveryCounter;
diff --git a/right/src/key_scanner.h b/right/src/key_scanner.h
index e1b1050..0a4688b 100644
--- a/right/src/key_scanner.h
+++ b/right/src/key_scanner.h
@@ -3,17 +3,13 @@
 
 // Includes:
 
+    #include "peripherals/pit.h"
     #include "right_key_matrix.h"
 
 // Macros:
 
     #define KEY_SCANNER_INTERVAL_USEC (1000 / RIGHT_KEY_MATRIX_ROWS_NUM)
 
-    #define PIT_KEY_SCANNER_HANDLER PIT1_IRQHandler
-    #define PIT_KEY_SCANNER_IRQ_ID PIT1_IRQn
-    #define PIT_KEY_SCANNER_CHANNEL kPIT_Chnl_1
-    #define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_BusClk)
-
 // Functions:
 
     void InitKeyScanner(void);
diff --git a/right/src/peripherals/pit.h b/right/src/peripherals/pit.h
new file mode 100644
index 0000000..bdc4204
--- /dev/null
+++ b/right/src/peripherals/pit.h
@@ -0,0 +1,16 @@
+#ifndef __PIT_H__
+#define __PIT_H__
+
+// Macros:
+
+    #define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_BusClk)
+
+    #define PIT_I2C_WATCHDOG_HANDLER PIT0_IRQHandler
+    #define PIT_I2C_WATCHDOG_IRQ_ID  PIT0_IRQn
+    #define PIT_I2C_WATCHDOG_CHANNEL kPIT_Chnl_0
+
+    #define PIT_KEY_SCANNER_HANDLER  PIT1_IRQHandler
+    #define PIT_KEY_SCANNER_IRQ_ID   PIT1_IRQn
+    #define PIT_KEY_SCANNER_CHANNEL  kPIT_Chnl_1
+
+#endif