-extern int DoRelocate( Uint base, char **envp, char *Filename );
-\r
-// === Library/Symbol Manipulation ==\r
-extern Uint LoadLibrary(char *filename, char *SearchDir, char **envp);
-extern void AddLoaded(char *File, Uint base);
-extern Uint GetSymbol(char *name);\r
-extern int GetSymbolFromBase(Uint base, char *name, Uint *ret);\r
-\r
-// === Library Functions ===\r
-extern char *strcpy(char *dest, const char *src);\r
+extern void *DoRelocate(void *Base, char **envp, const char *Filename);
+
+// === Library/Symbol Manipulation ==
+extern void *LoadLibrary(const char *Filename, const char *SearchDir, char **envp);
+extern void AddLoaded(const char *File, void *base);
+extern int GetSymbol(const char *Name, void **Value, size_t *size);
+extern int GetSymbolFromBase(void *base, const char *name, void **ret, size_t *size);
+
+// === Library Functions ===
+extern char *strcpy(char *dest, const char *src);