diff --git a/base/base.h b/base/base.h
index a948d58..55ddee2 100644
--- a/base/base.h
+++ b/base/base.h
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Lum
 #define __BASE_H__
 
 #include <avr/io.h>
-#include <avr/delay.h>
+#include <util/delay.h>
 
 #define LINE_OUT 1
 #define LINE_IN  0
@@ -50,7 +50,7 @@ inline void clear_line(gpio_t *line) {
 }
 
 inline int read_line(gpio_t *line) {
-    return (*(line->port) & _BV(line->addr)) > 0;
+    return (*(line->pin) & _BV(line->addr)) > 0;
 }
 
 typedef struct RNG {