diff --git a/ps2drv.h b/ps2drv.h
index 199ad30..b7c81d8 100644
--- a/ps2drv.h
+++ b/ps2drv.h
@@ -29,6 +29,19 @@ public:
 
 #define is_down(scan) ((scan) < 0x100)
 
+#undef PS2_F1
+#undef PS2_F2
+#undef PS2_F3
+#undef PS2_F4
+#undef PS2_F5
+#undef PS2_F6
+#undef PS2_F7
+#undef PS2_F8
+#undef PS2_F9
+#undef PS2_F10
+#undef PS2_F11
+#undef PS2_F12
+
 #define PS2_F1	0x05
 #define PS2_F2	0x06
 #define PS2_F3	0x04
diff --git a/z80.h b/z80.h
index bad4117..e2d42fd 100644
--- a/z80.h
+++ b/z80.h
@@ -64,6 +64,7 @@ public:
 
 	inline unsigned long ts() { return _ts; }
 	inline void ts(int t) { _ts += t; }
+	inline void reset_ts() { _ts = 0; }
 
 private:
 	void _handle_interrupt();