diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h
index 36cb41cef..c88d79cec 100644
--- a/ruamoko/qwaq/qwaq-app.h
+++ b/ruamoko/qwaq/qwaq-app.h
@@ -32,6 +32,6 @@ extern int color_palette[64];
 -run;
 @end
 
-@extern QwaqApplication *application;
+extern QwaqApplication *application;
 
 #endif//__qwaq_app_h
diff --git a/ruamoko/qwaq/qwaq-curses.h b/ruamoko/qwaq/qwaq-curses.h
index 111ada434..c43f08d13 100644
--- a/ruamoko/qwaq/qwaq-curses.h
+++ b/ruamoko/qwaq/qwaq-curses.h
@@ -84,55 +84,55 @@ typedef enum {
 typedef struct window_s *window_t;
 typedef struct panel_s *panel_t;
 
-@extern window_t stdscr;
+extern window_t stdscr;
 
-@extern void initialize (void);
-@extern window_t create_window (int xpos, int ypos, int xlen, int ylen);
-@extern void destroy_window (window_t win);
-@extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
-@extern void wprintf (window_t win, string fmt, ...);
-@extern void wvprintf (window_t win, string fmt, @va_list args);
-@extern void mvwvprintf (window_t win, int x, int y,
+extern void initialize (void);
+extern window_t create_window (int xpos, int ypos, int xlen, int ylen);
+extern void destroy_window (window_t win);
+extern void mvwprintf (window_t win, int x, int y, string fmt, ...);
+extern void wprintf (window_t win, string fmt, ...);
+extern void wvprintf (window_t win, string fmt, @va_list args);
+extern void mvwvprintf (window_t win, int x, int y,
 						 string fmt, @va_list args);
-@extern void wrefresh (window_t win);
-@extern void mvwaddch (window_t win, int x, int y, int ch);
-@extern void waddch (window_t win, int ch);
-@extern void mvwaddstr (window_t win, int x, int y, string str);
-@extern void waddstr (window_t win, string str);
+extern void wrefresh (window_t win);
+extern void mvwaddch (window_t win, int x, int y, int ch);
+extern void waddch (window_t win, int ch);
+extern void mvwaddstr (window_t win, int x, int y, string str);
+extern void waddstr (window_t win, string str);
 
-@extern panel_t create_panel (window_t window);
-@extern void destroy_panel (panel_t panel);
-@extern void hide_panel (panel_t panel);
-@extern void show_panel (panel_t panel);
-@extern void top_panel (panel_t panel);
-@extern void bottom_panel (panel_t panel);
-@extern void move_panel (panel_t panel, int x, int y);
-@extern window_t panel_window (panel_t panel);
-@extern void update_panels (void);
-@extern void replace_panel (panel_t panel, window_t window);
-@extern void doupdate (void);
+extern panel_t create_panel (window_t window);
+extern void destroy_panel (panel_t panel);
+extern void hide_panel (panel_t panel);
+extern void show_panel (panel_t panel);
+extern void top_panel (panel_t panel);
+extern void bottom_panel (panel_t panel);
+extern void move_panel (panel_t panel, int x, int y);
+extern window_t panel_window (panel_t panel);
+extern void update_panels (void);
+extern void replace_panel (panel_t panel, window_t window);
+extern void doupdate (void);
 
-@extern int get_event (qwaq_event_t *event);
-@extern int max_colors (void);
-@extern int max_color_pairs (void);
-@extern int init_pair (int pair, int f, int b);
-@extern void wbkgd (window_t win, int ch);
-@extern void werase (window_t win);
-@extern void scrollok (window_t win, int flag);
+extern int get_event (qwaq_event_t *event);
+extern int max_colors (void);
+extern int max_color_pairs (void);
+extern int init_pair (int pair, int f, int b);
+extern void wbkgd (window_t win, int ch);
+extern void werase (window_t win);
+extern void scrollok (window_t win, int flag);
 
-@extern int acs_char (int acs);
-@extern int curs_set (int visibility);
-@extern int move (int x, int y);
+extern int acs_char (int acs);
+extern int curs_set (int visibility);
+extern int move (int x, int y);
 
-@extern void wborder (window_t window,
-					  box_sides_t sides, box_corners_t corners);
-@extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
-@extern void wresize (window_t window, int width, int height);
-@extern void resizeterm (int width, int height);
+extern void wborder (window_t window,
+					 box_sides_t sides, box_corners_t corners);
+extern void mvwblit_line (window_t window, int x, int y, int *wch, int len);
+extern void wresize (window_t window, int width, int height);
+extern void resizeterm (int width, int height);
 
-@extern Rect getwrect (struct window_s *window);
+extern Rect getwrect (struct window_s *window);
 
-@extern void printf(string fmt, ...);
+extern void printf(string fmt, ...);
 // qfcc stuff
 #else
 // gcc stuff
diff --git a/ruamoko/qwaq/qwaq-debug.h b/ruamoko/qwaq/qwaq-debug.h
index e4de7c12c..630c9097a 100644
--- a/ruamoko/qwaq/qwaq-debug.h
+++ b/ruamoko/qwaq/qwaq-debug.h
@@ -55,27 +55,27 @@ typedef struct qdb_auxfunction_s {
 
 typedef struct qdb_target_s { int handle; } qdb_target_t;
 
-@extern void qdb_set_trace (qdb_target_t target, int state);
-@extern int qdb_set_breakpoint (qdb_target_t target, unsigned staddr);
-@extern int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr);
-@extern int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
-@extern int qdb_clear_watchpoint (qdb_target_t target);
-@extern int qdb_continue (qdb_target_t target);
-@extern qdb_state_t qdb_get_state (qdb_target_t target);
-@extern int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
-						  void *dst);
-@extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
-@extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
-@extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
-@extern qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum);
-@extern qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
-												 string name);
-@extern qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
-												unsigned fnum);
-@extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
+extern void qdb_set_trace (qdb_target_t target, int state);
+extern int qdb_set_breakpoint (qdb_target_t target, unsigned staddr);
+extern int qdb_clear_breakpoint (qdb_target_t target, unsigned staddr);
+extern int qdb_set_watchpoint (qdb_target_t target, unsigned offset);
+extern int qdb_clear_watchpoint (qdb_target_t target);
+extern int qdb_continue (qdb_target_t target);
+extern qdb_state_t qdb_get_state (qdb_target_t target);
+extern int qdb_get_data (qdb_target_t target, unsigned src, unsigned len,
+						 void *dst);
+extern qdb_def_t qdb_find_global (qdb_target_t target, string name);
+extern qdb_def_t qdb_find_field (qdb_target_t target, string name);
+extern qdb_function_t *qdb_find_function (qdb_target_t target, string name);
+extern qdb_function_t *qdb_get_function (qdb_target_t target, unsigned fnum);
+extern qdb_auxfunction_t *qdb_find_auxfunction (qdb_target_t target,
+												string name);
+extern qdb_auxfunction_t *qdb_get_auxfunction (qdb_target_t target,
+											   unsigned fnum);
+extern qdb_def_t *qdb_get_local_defs (qdb_target_t target, unsigned fnum);
 
-@extern void traceon();
-@extern void traceoff();
+extern void traceon();
+extern void traceoff();
 
 #else//GCC
 
diff --git a/ruamoko/qwaq/qwaq-rect.h b/ruamoko/qwaq/qwaq-rect.h
index ba1e47c10..2f7915ff1 100644
--- a/ruamoko/qwaq/qwaq-rect.h
+++ b/ruamoko/qwaq/qwaq-rect.h
@@ -17,12 +17,12 @@ typedef struct Rect_s {
 } Rect;
 
 #ifdef __QFCC__
-@extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
-@extern Point makePoint (int x, int y);
-@extern Extent makeExtent (int width, int height);
-@extern Extent mergeExtents (Extent a, Extent b);
-@extern int rectContainsPoint (Rect rect, Point point);
-@extern Rect clipRect (Rect clipRect, Rect rect);
+extern Rect makeRect (int xpos, int ypos, int xlen, int ylen);
+extern Point makePoint (int x, int y);
+extern Extent makeExtent (int width, int height);
+extern Extent mergeExtents (Extent a, Extent b);
+extern int rectContainsPoint (Rect rect, Point point);
+extern Rect clipRect (Rect clipRect, Rect rect);
 #endif
 
 #endif//__qwaq_rect_h