diff --git a/html.c b/html.c
index db0a60f..5197ad8 100644
--- a/html.c
+++ b/html.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include <stdio.h>
 #include "html.h"
 
@@ -52,4 +51,4 @@ void printFoot(FILE * fp) {
 	fprintf(fp,"		</table>\n");
 	fprintf(fp,"	</body>\n");
 	fprintf(fp,"</html>\n");
-}
\ No newline at end of file
+}
diff --git a/html.h b/html.h
index 2f17e5c..4508dda 100644
--- a/html.h
+++ b/html.h
@@ -1,6 +1,8 @@
 #ifndef html_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define html_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 #include <stdio.h>
 
 void genHTML(sudoku * s,FILE * fp);
diff --git a/input.c b/input.c
index 0da9e16..a265e92 100644
--- a/input.c
+++ b/input.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "input.h"
 #include <string.h>
 #include <stdio.h>
@@ -60,4 +59,4 @@ int s_einlesen(char * path, sudoku * sf, options * o) {
 	fclose(fp);
 	if(z<9) return 0;
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/input.h b/input.h
index 798aa6c..2695333 100644
--- a/input.h
+++ b/input.h
@@ -1,6 +1,8 @@
 #ifndef input_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define input_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Reads the Sudoku from file
  * @param path The File to read from
diff --git a/input_nstd.c b/input_nstd.c
index 82fa701..bb27b2f 100644
--- a/input_nstd.c
+++ b/input_nstd.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "input.h"
 #include <string.h>
 #include <stdio.h>
@@ -57,4 +56,4 @@ int s_b_einlesen(char * path, sudoku * sf) {
 	fclose(fp);
 	if(z<9) return 0;
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/input_nstd.h b/input_nstd.h
index 957602c..0e7b4c8 100644
--- a/input_nstd.h
+++ b/input_nstd.h
@@ -1,6 +1,8 @@
 #ifndef imput_nstd_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define imput_nstd_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Reads the Sudoku from file
  * @param path The File to read from
diff --git a/main.c b/main.c
index df7d0bd..92c440a 100644
--- a/main.c
+++ b/main.c
@@ -19,7 +19,6 @@
  * MA 02110-1301, USA.
  */
 
-#include "types.h"
 #include "main.h"
 #include "input.h"
 #include "input_nstd.h"
diff --git a/main.h b/main.h
index 2d272c4..64030b9 100644
--- a/main.h
+++ b/main.h
@@ -1,6 +1,8 @@
 #ifndef main_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define main_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 int main(int argc, char **argv);
 void readOptions(int argc, char **argv, options * o);
 void newStandard(options * o);
diff --git a/output.c b/output.c
index 7f51368..77cd799 100644
--- a/output.c
+++ b/output.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "output.h"
 #include <stdio.h>
 
@@ -48,4 +47,4 @@ void s_plain(sudoku* s, int color) {
 		}
 		printf("\n");
 	}
-}
\ No newline at end of file
+}
diff --git a/output.h b/output.h
index 9ceffa6..728d107 100644
--- a/output.h
+++ b/output.h
@@ -1,6 +1,8 @@
 #ifndef output_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define output_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Write the sudoku to a file
  * @param fn The Filename
diff --git a/output_nstd.c b/output_nstd.c
index 3fdeb42..4499fee 100644
--- a/output_nstd.c
+++ b/output_nstd.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "output_nstd.h"
 #include <stdio.h>
 
@@ -107,4 +106,4 @@ void nstd_ausgabe(sudoku* s,int color) {
 		printf("\n");
 	}
 	if(!color) printf("+-------+-------+-------+\n");
-}
\ No newline at end of file
+}
diff --git a/output_nstd.h b/output_nstd.h
index c30de6e..7368977 100644
--- a/output_nstd.h
+++ b/output_nstd.h
@@ -1,6 +1,8 @@
 #ifndef output_nstd_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define output_nstd_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Print the Sudoku on stdout using unicode borders
  * @param s The Sudoku
diff --git a/output_std.c b/output_std.c
index 718d1df..297fc69 100644
--- a/output_std.c
+++ b/output_std.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "output_std.h"
 #include <stdio.h>
 
@@ -58,4 +57,4 @@ void std_ausgabe(sudoku* s,int color) {
 		printf("|\n");
 	}
 	printf("+-------+-------+-------+\n");
-}
\ No newline at end of file
+}
diff --git a/output_std.h b/output_std.h
index 535526a..9621a1f 100644
--- a/output_std.h
+++ b/output_std.h
@@ -1,6 +1,8 @@
 #ifndef output_std_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define output_std_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Print the Sudoku on stdout using unicode borders
  * @param s The Sudoku
diff --git a/solver.c b/solver.c
index ee01034..517ea47 100644
--- a/solver.c
+++ b/solver.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "solver.h"
 
 int  sl_loes(sudoku* s, options * o) {
@@ -40,4 +39,4 @@ int s_loes_track(sudoku * s, int pos, options * o) {
 	}
 	s->feld[x][y] = 0;
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/solver.h b/solver.h
index 3e3a9ab..e934abd 100644
--- a/solver.h
+++ b/solver.h
@@ -1,6 +1,8 @@
 #ifndef solver_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define solver_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Tries to solve the Sudoku with logic
  * @param s the sudokue to solve
diff --git a/solver_nstd.c b/solver_nstd.c
index d811266..6b26e31 100644
--- a/solver_nstd.c
+++ b/solver_nstd.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "solver_nstd.h"
 
 int solver_nstd_check_nums(sudoku* s,int zahl,int z, int sp) {
@@ -56,4 +55,4 @@ int  solver_nstd_test(sudoku *s, int z, int sp, int zahl) {
 		}
 	}
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/solver_nstd.h b/solver_nstd.h
index ea9be4a..63d168a 100644
--- a/solver_nstd.h
+++ b/solver_nstd.h
@@ -1,6 +1,8 @@
 #ifndef solver_nstd_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define solver_nstd_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Checks if there are other posibilities for the number if not return 1
  * @param s The sudoku struct
diff --git a/solver_std.c b/solver_std.c
index 0c29c2e..c92e153 100644
--- a/solver_std.c
+++ b/solver_std.c
@@ -1,4 +1,3 @@
-#include "types.h"
 #include "solver_std.h"
 
 int solver_check_nums(sudoku* s,int zahl,int z, int sp) {
@@ -48,4 +47,4 @@ int  solver_test(sudoku *s, int z, int sp, int zahl) {
 		for(j=0;j<3;j++)
 			if(s->feld[x+i][y+j] == zahl) return 0;
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/solver_std.h b/solver_std.h
index 72f9f73..2434cc5 100644
--- a/solver_std.h
+++ b/solver_std.h
@@ -1,6 +1,8 @@
 #ifndef solver_std_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 #define solver_std_2b894a04_3a0c_4223_bf83_6ab40c0f5e57_h__
 
+#include "types.h"
+
 /**
  * Checks if there are other posibilities for the number if not return 1
  * @param s The sudoku struct