-int loadmap(char *mn, map_t *map);\r
-#endif/*_LIBMAPREAD_H_*/\r
+//typedefs moved to 16_tdef.h\r
+\r
+//word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);\r
+//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
+int newloadmap(char *mn, map_t *map);\r
+int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
+\r
+#endif/*_16_LIB__H_*/\r