9 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 36bb783f87ff..a0765d821268 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CFLAGS = -g -Wall --std=c99 -D_FORTIFY_SOURCE=2 -O2 \
 -Wundef -Wnested-externs -Wcast-qual -Wunreachable-code \
 -ggdb3 -fno-omit-frame-pointer -ffloat-store -fno-common -fstrict-aliasing \
 -Wno-unused-parameter `pkg-config --cflags gtk+-3.0 cairo` -Wl,--export-dynamic
-OBJECTS = main.o api.o portfolio.o rc4.o string-tick.o info.o gtk_win.o
+OBJECTS = main.o api.o portfolio.o rc4.o utils.o curses_win.o gtk_win.o
 LIBS = -lcurl -ljson-c -lm -lncurses -lpthread -lcairo \
 `pkg-config --libs gtk+-3.0 gmodule-export-2.0 cairo`
 BIN = tick
diff --git a/api.h b/api.h
index 516b3a5ead84..274f718ba867 100644
--- a/api.h
+++ b/api.h
@@ -22,7 +22,7 @@
 #include <curl/curl.h>
 #include <json-c/json_tokener.h>
 #include <pthread.h>
-#include "string-tick.h"
+#include "utils.h"
 
 typedef struct news_article {
     char headline[INFO_TEXT_MAX];
diff --git a/info.c b/curses_win.c
index e69ece26a7c3..c3fe077a2304 100644
--- a/info.c
+++ b/curses_win.c
@@ -1,4 +1,4 @@
-#include "info.h"
+#include "curses_win.h"
 
 int zoom_months[] = {60, 48, 36, 24, 12, 9, 6, 3, 1}, zoom_change_x_months[] = {12, 12, 12, 12, 12, 3, 3, 3, 2};
 
diff --git a/info.h b/curses_win.h
index 6e00d6abe5fd..6e00d6abe5fd 100644
--- a/info.h
+++ b/curses_win.h
diff --git a/main.c b/main.c
index ad69c68f3ef2..1be36cbb0979 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
 #include "portfolio.h"
-#include "info.h"
+#include "curses_win.h"
 #include "gtk_win.h"
 
 int main(int argc, char* argv[]) {
diff --git a/rc4.c b/rc4.c
index 471294d5e55f..040c5d7f18c2 100644
--- a/rc4.c
+++ b/rc4.c
@@ -1,5 +1,4 @@
 #include "rc4.h"
-#include "portfolio.h"
 
 char* rc4_ncurses_get_password(void) {
     unsigned char* pass = malloc(PASS_MAX + 1);
diff --git a/rc4.h b/rc4.h
index e44a30d89744..209cbdc700a9 100644
--- a/rc4.h
+++ b/rc4.h
@@ -10,7 +10,8 @@
 #include <ncurses.h>
 #include <json-c/json_tokener.h>
 #include <unistd.h>
-#include "string-tick.h"
+#include "utils.h"
+#include "portfolio.h"
 
 /**
  * Returns a password string taken from user input with a maximum of 32 characters. The user's input
diff --git a/string-tick.c b/utils.c
index 5ddf41373cd6..b34625fd7f10 100644
--- a/string-tick.c
+++ b/utils.c
@@ -1,4 +1,4 @@
-#include "string-tick.h"
+#include "utils.h"
 
 String* string_init(void) {
     String* pString = (String*) malloc(sizeof(String));
diff --git a/string-tick.h b/utils.h
index 9825fd055ad4..9825fd055ad4 100644
--- a/string-tick.h
+++ b/utils.h