diff --git a/main.h b/main.h
index 6e1b81d..15fd1b6 100644
--- a/main.h
+++ b/main.h
@@ -1,17 +1,17 @@
 #ifndef unigi_header_main
 #define unigi_header_main
-#include "types.h"
 #include "structs.h"
+#include "types.h"
 
 // MAIN
 unigi_type_error unigi_init();
 
 // GRAPHICS
 unigi_type_error unigi_graphics_init();
-unigi_type_resolution_range * unigi_resolutions;
-static inline void unigi_graphics_draw(unigi_type_resolution_1d_coord index, unigi_type_color color);
-static inline void unigi_graphics_blit(unigi_type_resolution_1d_coord index, unigi_type_color * pixels, unigi_type_resolution_1d_coord length);
-static inline void unigi_graphics_flush();
+extern unigi_type_resolution_range * unigi_resolutions;
+void unigi_graphics_draw(unigi_type_resolution_1d_coord index, unigi_type_color color);
+void unigi_graphics_blit(unigi_type_resolution_1d_coord index, unigi_type_color * pixels, unigi_type_resolution_1d_coord length);
+void unigi_graphics_flush();
 
 unigi_type_error unigi_window_create(unigi_type_resolution resolution, char * title);
 unigi_type_time_span unigi_time_get();
diff --git a/structs.h b/structs.h
index dbd5223..0229779 100644
--- a/structs.h
+++ b/structs.h
@@ -1,38 +1,39 @@
 #ifndef unigi_header_structs
 #define unigi_header_structs
+#include "types.h"
 // * EVENTS
 struct unigi_type_event_none {
 	uint8_t none;
 };
 typedef struct unigi_type_event_none unigi_type_event_none;
-const unigi_type_event_enum unigi_enum_event_none = 0;
+static const unigi_type_event_enum unigi_enum_event_none = 0;
 
 struct unigi_type_event_unknown {
 	uint8_t none;
 };
 typedef struct unigi_type_event_unknown unigi_type_event_unknown;
-const unigi_type_event_enum unigi_enum_event_unknown = 1;
+static const unigi_type_event_enum unigi_enum_event_unknown = 1;
 
-const unigi_type_event_enum unigi_enum_event_window_quit = 2;
+static const unigi_type_event_enum unigi_enum_event_window_quit = 2;
 struct unigi_type_event_window_quit {
 	uint8_t none;
 };
 typedef struct unigi_type_event_window_quit unigi_type_event_window_quit;
 
-const unigi_type_event_enum unigi_enum_event_window_focus = 4;
+static const unigi_type_event_enum unigi_enum_event_window_focus = 4;
 struct unigi_type_event_window_focus {
 	uint8_t focused;
 };
 typedef struct unigi_type_event_window_focus unigi_type_event_window_focus;
 
-const unigi_type_event_enum unigi_enum_event_window_activate = 5;
+static const unigi_type_event_enum unigi_enum_event_window_activate = 5;
 struct unigi_type_event_window_activate {
 	uint8_t active;
 };
 typedef struct unigi_type_event_window_activate unigi_type_event_window_activate;
 
 // Keyboard
-const unigi_type_event_enum unigi_enum_event_input_keyboard = 6;
+static const unigi_type_event_enum unigi_enum_event_input_keyboard = 6;
 struct unigi_type_event_input_keyboard {
 	unigi_type_input_device device;
 	unigi_type_input_keyboard_button button;
@@ -41,7 +42,7 @@ struct unigi_type_event_input_keyboard {
 typedef struct unigi_type_event_input_keyboard unigi_type_event_input_keyboard;
 
 // Mouse
-const unigi_type_event_enum unigi_enum_event_input_mouse_button = 7;
+static const unigi_type_event_enum unigi_enum_event_input_mouse_button = 7;
 struct unigi_type_event_input_mouse_button {
 	unigi_type_input_device device;
 	unigi_type_input_mouse_button button;
@@ -49,7 +50,7 @@ struct unigi_type_event_input_mouse_button {
 };
 typedef struct unigi_type_event_input_mouse_button unigi_type_event_input_mouse_button;
 
-const unigi_type_event_enum unigi_enum_event_input_mouse_move = 8;
+static const unigi_type_event_enum unigi_enum_event_input_mouse_move = 8;
 struct unigi_type_event_input_mouse_move {
 	unigi_type_input_device device;
 	unigi_type_input_mouse_coord_relative rel_x;
@@ -59,7 +60,7 @@ struct unigi_type_event_input_mouse_move {
 };
 typedef struct unigi_type_event_input_mouse_move unigi_type_event_input_mouse_move;
 
-const unigi_type_event_enum unigi_enum_event_input_mouse_scroll = 9;
+static const unigi_type_event_enum unigi_enum_event_input_mouse_scroll = 9;
 struct unigi_type_event_input_mouse_scroll {
 	unigi_type_input_device device;
 	unigi_type_input_mouse_coord_scroll scroll_x;
@@ -68,7 +69,7 @@ struct unigi_type_event_input_mouse_scroll {
 typedef struct unigi_type_event_input_mouse_scroll unigi_type_event_input_mouse_scroll;
 
 // Joypad
-const unigi_type_event_enum unigi_enum_event_input_joypad_button = 10;
+static const unigi_type_event_enum unigi_enum_event_input_joypad_button = 10;
 struct unigi_type_event_input_joypad_button {
 	unigi_type_input_device device;
 	unigi_type_input_mouse_button button;
@@ -76,7 +77,7 @@ struct unigi_type_event_input_joypad_button {
 };
 typedef struct unigi_type_event_input_joypad_button unigi_type_event_input_joypad_button;
 
-const unigi_type_event_enum unigi_enum_event_input_joypad_analog = 11;
+static const unigi_type_event_enum unigi_enum_event_input_joypad_analog = 11;
 struct unigi_type_event_input_joypad_analog {
 	unigi_type_input_device device;
 	unigi_type_input_joypad_button axis;