diff --git a/Hashtable.h b/Hashtable.h
index 21dfdcc6e6fe2003f19adf6d83d612c634a8aade..4abd13332280271b8d5137492cd9b46b55070244 100644
--- a/Hashtable.h
+++ b/Hashtable.h
@@ -47,13 +47,13 @@ Hashtable* Hashtable_new(int size, bool owner);
 
 void Hashtable_delete(Hashtable* this);
 
-inline int Hashtable_size(Hashtable* this);
+extern int Hashtable_size(Hashtable* this);
 
 void Hashtable_put(Hashtable* this, unsigned int key, void* value);
 
 void* Hashtable_remove(Hashtable* this, unsigned int key);
 
-inline void* Hashtable_get(Hashtable* this, unsigned int key);
+extern void* Hashtable_get(Hashtable* this, unsigned int key);
 
 void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData);
 
diff --git a/Panel.h b/Panel.h
index 512545b2349f4a7b957e418ddbf0f33b906cc238..54e30877714d72992ea898d3eeac71bec901e417 100644
--- a/Panel.h
+++ b/Panel.h
@@ -72,9 +72,9 @@ void Panel_init(Panel* this, int x, int y, int w, int h, char* type, bool owner)
 
 void Panel_done(Panel* this);
 
-inline void Panel_setRichHeader(Panel* this, RichString header);
+extern void Panel_setRichHeader(Panel* this, RichString header);
 
-inline void Panel_setHeader(Panel* this, char* header);
+extern void Panel_setHeader(Panel* this, char* header);
 
 void Panel_setEventHandler(Panel* this, Panel_EventHandler eh);
 
diff --git a/RichString.h b/RichString.h
index 1f486781eddb9821daef396979c546224fcb9686..6972afecf1897a9215a4a48400ee17d083ace7a7 100644
--- a/RichString.h
+++ b/RichString.h
@@ -29,9 +29,9 @@ typedef struct RichString_ {
 
 void RichString_write(RichString* this, int attrs, char* data);
 
-inline void RichString_append(RichString* this, int attrs, char* data);
+extern void RichString_append(RichString* this, int attrs, char* data);
 
-inline void RichString_appendn(RichString* this, int attrs, char* data, int len);
+extern void RichString_appendn(RichString* this, int attrs, char* data, int len);
 
 void RichString_setAttr(RichString *this, int attrs);
 
diff --git a/ScreenManager.h b/ScreenManager.h
index 416164c4cdedec31ccffe494bcd1142a7d3e8c72..898da2f28f96ef8aa6f3875b9561385ea2d68c4f 100644
--- a/ScreenManager.h
+++ b/ScreenManager.h
@@ -43,7 +43,7 @@ ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation ori
 
 void ScreenManager_delete(ScreenManager* this);
 
-inline int ScreenManager_size(ScreenManager* this);
+extern int ScreenManager_size(ScreenManager* this);
 
 void ScreenManager_add(ScreenManager* this, Panel* item, FunctionBar* fuBar, int size);
 
diff --git a/String.h b/String.h
index 8f0b50b58cd2095108e65b6a3d248ded1a425324..71e92faa33ec93b4e7be6a307334cab0c6ae38e1 100644
--- a/String.h
+++ b/String.h
@@ -19,9 +19,9 @@ in the source distribution for its full text.
 
 #define String_startsWith(s, match) (strstr((s), (match)) == (s))
 
-inline void String_delete(char* s);
+extern void String_delete(char* s);
 
-inline char* String_copy(char* orig);
+extern char* String_copy(char* orig);
 
 char* String_cat(char* s1, char* s2);
 
@@ -39,7 +39,7 @@ void String_printInt(int i);
 
 void String_printPointer(void* p);
 
-inline int String_eq(const char* s1, const char* s2);
+extern int String_eq(const char* s1, const char* s2);
 
 char** String_split(char* s, char sep);
 
diff --git a/UsersTable.h b/UsersTable.h
index 7f6740eb47fc8c67f23fca849f8c042a207a7329..b0d06fc33e5289d9c6507bc1a0341a8b148e3748 100644
--- a/UsersTable.h
+++ b/UsersTable.h
@@ -30,8 +30,8 @@ void UsersTable_delete(UsersTable* this);
 
 char* UsersTable_getRef(UsersTable* this, unsigned int uid);
 
-inline int UsersTable_size(UsersTable* this);
+extern int UsersTable_size(UsersTable* this);
 
-inline void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData);
+extern void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData);
 
 #endif
diff --git a/Vector.h b/Vector.h
index 3ecfd2707a48150c7b452a855badb1547d3b4890..209da0e5265813b853e8e6ac8e7af73fbfeb2cf9 100644
--- a/Vector.h
+++ b/Vector.h
@@ -61,15 +61,15 @@ void Vector_moveDown(Vector* this, int index);
 
 void Vector_set(Vector* this, int index, void* data_);
 
-inline Object* Vector_get(Vector* this, int index);
+extern Object* Vector_get(Vector* this, int index);
 
-inline int Vector_size(Vector* this);
+extern int Vector_size(Vector* this);
 
 void Vector_merge(Vector* this, Vector* v2);
 
 void Vector_add(Vector* this, void* data_);
 
-inline int Vector_indexOf(Vector* this, void* search_, Object_Compare compare);
+extern int Vector_indexOf(Vector* this, void* search_, Object_Compare compare);
 
 void Vector_foreach(Vector* this, Vector_procedure f);
 
diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
index dd9d99d118a9a705e26e524b9ae3a0a4df70181a..a84ae74bee0cad373791e8db1d5a93bf4b2b0644 100755
--- a/scripts/MakeHeader.py
+++ b/scripts/MakeHeader.py
@@ -54,7 +54,7 @@ for line in file.readlines():
          elif equals != -1:
             out.write("extern " + line[:equals] + ";" )
          elif line[-1] == "{":
-            out.write( line[:-2] + ";" )
+            out.write( line[:-2].replace("inline", "extern") + ";" )
             state = SKIP
          else:
             out.write( line )