diff --git a/lib/card.c b/lib/card.c
index 6175209..9a2803d 100644
--- a/lib/card.c
+++ b/lib/card.c
@@ -1,6 +1,5 @@
 #include <ncurses.h>
 #include <malloc.h>
-#include "frame.h"
 #include "card.h"
 
 struct card *initialize_card() {
diff --git a/lib/card.h b/lib/card.h
index 4eba551..d79db06 100644
--- a/lib/card.h
+++ b/lib/card.h
@@ -1,6 +1,8 @@
 #ifndef CARD_H
 #define CARD_H
 
+#include "frame.h"
+
 enum value {
   NO_VALUE = -1,
   TWO      = 2,
diff --git a/lib/display.c b/lib/display.c
index 531e614..8df6ade 100644
--- a/lib/display.c
+++ b/lib/display.c
@@ -2,8 +2,6 @@
 #include <malloc.h>
 #include <string.h>
 #include <locale.h>
-#include "frame.h"
-#include "card.h"
 #include "display.h"
 
 void init_curses() {
diff --git a/lib/frame.c b/lib/frame.c
index 33e45da..2df8159 100644
--- a/lib/frame.c
+++ b/lib/frame.c
@@ -1,4 +1,3 @@
-#include <ncurses.h>
 #include <malloc.h>
 #include "frame.h"
 
diff --git a/lib/frame.h b/lib/frame.h
index 0a10592..d01f98a 100644
--- a/lib/frame.h
+++ b/lib/frame.h
@@ -1,6 +1,8 @@
 #ifndef FRAME_H
 #define FRAME_H
 
+#include <ncurses.h>
+
 #define FRAME_WIDTH  7
 #define FRAME_HEIGHT 5
 
diff --git a/lib/stack.c b/lib/stack.c
index 06399f9..5c5c69b 100644
--- a/lib/stack.c
+++ b/lib/stack.c
@@ -1,6 +1,5 @@
 #include <malloc.h>
 #include <stdbool.h>
-#include "card.h"
 #include "stack.h"
 
 void initialize_stack(struct stack **stack) {
diff --git a/lib/stack.h b/lib/stack.h
index 18fb97d..03d6f34 100644
--- a/lib/stack.h
+++ b/lib/stack.h
@@ -1,6 +1,8 @@
 #ifndef STACK_H
 #define STACK_H
 
+#include "card.h"
+
 struct stack {
   struct card  *card;
   struct stack *next;