diff --git a/collisionDetection.c b/collisionDetection.c
index bdb7366..2abcfad 100644
--- a/collisionDetection.c
+++ b/collisionDetection.c
@@ -1,5 +1,9 @@
 #include <world.h>
 #include <string.h>
+#include <drawWindows.h>
+#include <weaponsSystem.h>
+#include <unistd.h>
+
 struct CollisionEvent collisionDetect(int objYpos, int objXpos){
 	int i;
 	for(i=1; i<MAX_ENTITIES; i++){
diff --git a/drawWindows.c b/drawWindows.c
index 3b9c925..7ce1089 100644
--- a/drawWindows.c
+++ b/drawWindows.c
@@ -1,8 +1,8 @@
 #include <world.h>
+#include <initializeWorld.h>
 #include <stdlib.h>
 #include <string.h>
 #include <weaponsSystem.h>
-
 void updateViewportWin(){
 	int i;
 	for(i=0; i<MAX_ITEMS; i++){
diff --git a/drawWindows.h b/drawWindows.h
new file mode 100644
index 0000000..bda0b64
--- /dev/null
+++ b/drawWindows.h
@@ -0,0 +1,8 @@
+#ifndef _DRAW_WINDOWS
+#define _DRAW_WINDOWS
+
+void updateViewportWin();
+void updateInfoWin();
+void drawGameOverWin();
+
+#endif
diff --git a/events.c b/events.c
index 7e5b451..db53e43 100644
--- a/events.c
+++ b/events.c
@@ -4,6 +4,7 @@
 #include <getPos.h>
 #include <time.h>
 #include <stdlib.h>
+#include <string.h>
 #include <zombies.h>
 
 void addItem(char *type, int yPos, int xPos){
diff --git a/events.h b/events.h
index f9022a6..78e0319 100644
--- a/events.h
+++ b/events.h
@@ -3,4 +3,5 @@
 
 void addItem(char *type, int yPos, int xPos);
 void randomEvent();
+void tryRandomEvent();
 #endif
diff --git a/gameLoop.c b/gameLoop.c
index bcb1901..f16874a 100644
--- a/gameLoop.c
+++ b/gameLoop.c
@@ -3,6 +3,8 @@
 #include <events.h>
 #include <getPos.h>
 #include <weaponsSystem.h>
+#include <zombies.h>
+#include <drawWindows.h>
 
 void gameLoop(){
 	while(1) {
diff --git a/gameLoop.h b/gameLoop.h
new file mode 100644
index 0000000..f63a9f9
--- /dev/null
+++ b/gameLoop.h
@@ -0,0 +1,6 @@
+#ifndef _GAME_LOOP
+#define _GAME_LOOP
+
+void gameLoop();
+
+#endif
diff --git a/getPos.c b/getPos.c
index ba0c856..95018a2 100644
--- a/getPos.c
+++ b/getPos.c
@@ -1,5 +1,7 @@
 #include <world.h>
 #include <getPos.h>
+#include <stdlib.h>
+
 struct OpenPos getOpenPos(){
 	int chooseAnother=1;
 	struct OpenPos openPos;
diff --git a/getPos.h b/getPos.h
index 8d1b831..36e71cc 100644
--- a/getPos.h
+++ b/getPos.h
@@ -12,4 +12,7 @@ struct NextPos{
 }nextPos;
 
 struct OpenPos getOpenPos();
+
+void getNextPos(int y, int x, int y2, int x2);
+
 #endif
diff --git a/initializeWorld.c b/initializeWorld.c
index 63c531d..8655a37 100644
--- a/initializeWorld.c
+++ b/initializeWorld.c
@@ -3,6 +3,9 @@
 #include <string.h>
 #include <ncurses.h>
 #include <world.h>
+#include <drawWindows.h>
+#include <zombies.h>
+#include <nZombies.h>
 #include <getPos.h>
 
 void initializeWorld() {
diff --git a/initializeWorld.h b/initializeWorld.h
new file mode 100644
index 0000000..d87fc5f
--- /dev/null
+++ b/initializeWorld.h
@@ -0,0 +1,7 @@
+#ifndef _EVENTS
+#define _EVENTS
+
+void initializeWorld();
+void restartGame();
+
+#endif
diff --git a/nZombies.c b/nZombies.c
index 3857d22..3341c42 100644
--- a/nZombies.c
+++ b/nZombies.c
@@ -1,4 +1,7 @@
 #include <time.h>
+#include <initializeWorld.h>
+#include <gameLoop.h>
+
 int main() {
 	initializeWorld();
 	gameLoop();
diff --git a/nZombies.h b/nZombies.h
new file mode 100644
index 0000000..6773adf
--- /dev/null
+++ b/nZombies.h
@@ -0,0 +1,6 @@
+#ifndef _N_Zombies
+#define _N_Zombies
+
+void main();
+
+#endif
diff --git a/weaponsSystem.c b/weaponsSystem.c
index 9a9516d..0e9acbe 100644
--- a/weaponsSystem.c
+++ b/weaponsSystem.c
@@ -1,6 +1,8 @@
 #include <world.h>
 #include <collisionDetection.h>
 #include <weaponsSystem.h>
+#include <string.h>
+
 void moveProjectiles(){
 	int i;
 	for(i=0; i<MAX_PROJECTILES; i++){
diff --git a/weaponsSystem.h b/weaponsSystem.h
index 8c63ffb..e30a2ee 100644
--- a/weaponsSystem.h
+++ b/weaponsSystem.h
@@ -4,5 +4,6 @@
 void moveProjectiles();
 void fireWeapon();
 void addMagazine();
+void reload(struct Weapon *weaponRef);
 
 #endif
diff --git a/zombies.c b/zombies.c
index 336f280..5232816 100644
--- a/zombies.c
+++ b/zombies.c
@@ -1,6 +1,9 @@
 #include <world.h>
 #include <getPos.h>
 #include <collisionDetection.h>
+#include <stdlib.h>
+#include <getPos.h>
+
 void addZombie(int y, int x){
 	if (y && x){
 		int i;