diff --git a/ffi/clutter/cogl/ffi/ffi.factor b/ffi/clutter/cogl/ffi/ffi.factor
index 5030adcf1b..daf0b0d7a1 100644
--- a/ffi/clutter/cogl/ffi/ffi.factor
+++ b/ffi/clutter/cogl/ffi/ffi.factor
@@ -18,7 +18,7 @@ library: clutter.cogl
 } cond
 >>
 
-FOREIGN-ATOMIc-type: GL.uint GLuint
-FOREIGN-ATOMIc-type: GL.enum GLenum
+FOREIGN-ATOMIC-TYPE: GL.uint GLuint ;
+FOREIGN-ATOMIC-TYPE: GL.enum GLenum ;
 
 gir: Cogl-1.0.gir
diff --git a/ffi/clutter/ffi/ffi.factor b/ffi/clutter/ffi/ffi.factor
index d78a00e66f..fd73fcccc8 100644
--- a/ffi/clutter/ffi/ffi.factor
+++ b/ffi/clutter/ffi/ffi.factor
@@ -22,6 +22,6 @@ library: clutter
 } cond
 >>
 
-FOREIGN-RECORD-TYPE: cairo.Path cairo_path_t
+FOREIGN-RECORD-TYPE: cairo.Path cairo_path_t ;
 
 gir: Clutter-1.0.gir
diff --git a/ffi/gdk/ffi/ffi.factor b/ffi/gdk/ffi/ffi.factor
index 47c2629087..90a9729415 100644
--- a/ffi/gdk/ffi/ffi.factor
+++ b/ffi/gdk/ffi/ffi.factor
@@ -28,13 +28,13 @@ STRUCT: cairo_rectangle_int_t
 c-type: cairo_region_t
 ! workaround>
 
-FOREIGN-RECORD-TYPE: cairo.RectangleInt cairo_rectangle_int_t
-FOREIGN-RECORD-TYPE: cairo.Region cairo_region_t
-FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t
-FOREIGN-RECORD-TYPE: cairo.Surface cairo_surface_t
-FOREIGN-RECORD-TYPE: cairo.Pattern cairo_pattern_t
-FOREIGN-RECORD-TYPE: cairo.Context cairo_t
-FOREIGN-ENUM-TYPE: cairo.Content cairo_content_t
+FOREIGN-RECORD-TYPE: cairo.RectangleInt cairo_rectangle_int_t ;
+FOREIGN-RECORD-TYPE: cairo.Region cairo_region_t ;
+FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t ;
+FOREIGN-RECORD-TYPE: cairo.Surface cairo_surface_t ;
+FOREIGN-RECORD-TYPE: cairo.Pattern cairo_pattern_t ;
+FOREIGN-RECORD-TYPE: cairo.Context cairo_t ;
+FOREIGN-ENUM-TYPE: cairo.Content cairo_content_t ;
 
 gir: vocab:gdk/Gdk-3.0.gir
 
diff --git a/ffi/gobject-introspection/gobject-introspection.factor b/ffi/gobject-introspection/gobject-introspection.factor
index db15f13f8f..46e544191c 100755
--- a/ffi/gobject-introspection/gobject-introspection.factor
+++ b/ffi/gobject-introspection/gobject-introspection.factor
@@ -60,11 +60,11 @@ SYNTAX: IMPLEMENT-STRUCTS:
     ";" parse-tokens
     implement-structs [ swap append! ] change-global ;
 
-SYNTAX: FOREIGN-ATOMIc-type:
-    scan-token scan-object swap register-atomic-type ;
+SYNTAX: FOREIGN-ATOMIC-TYPE:
+    scan-token scan-object ";" expect swap register-atomic-type ;
 
 SYNTAX: FOREIGN-ENUM-TYPE:
-    scan-token scan-object swap register-enum-type ;
+    scan-token scan-object ";" expect swap register-enum-type ;
 
 SYNTAX: FOREIGN-RECORD-TYPE:
-    scan-token scan-object swap register-record-type ;
+    scan-token scan-object ";" expect swap register-record-type ;
diff --git a/ffi/gstreamer/ffi/ffi.factor b/ffi/gstreamer/ffi/ffi.factor
index 1faf1a90cd..485c27c531 100644
--- a/ffi/gstreamer/ffi/ffi.factor
+++ b/ffi/gstreamer/ffi/ffi.factor
@@ -28,9 +28,9 @@ TYPEDEF: void* xmlNodePtr ;
 TYPEDEF: void* xmlDocPtr ;
 TYPEDEF: void* xmlNsPtr ;
 
-FOREIGN-ATOMIc-type: libxml2.NodePtr xmlNodePtr
-FOREIGN-ATOMIc-type: libxml2.DocPtr xmlDocPtr
-FOREIGN-ATOMIc-type: libxml2.NsPtr xmlNsPtr
+FOREIGN-ATOMIC-TYPE: libxml2.NodePtr xmlNodePtr ;
+FOREIGN-ATOMIC-TYPE: libxml2.DocPtr xmlDocPtr ;
+FOREIGN-ATOMIC-TYPE: libxml2.NsPtr xmlNsPtr ;
 
 PRIVATE>
 
diff --git a/ffi/pango/cairo/ffi/ffi.factor b/ffi/pango/cairo/ffi/ffi.factor
index abd1bb042a..045c55e9ee 100644
--- a/ffi/pango/cairo/ffi/ffi.factor
+++ b/ffi/pango/cairo/ffi/ffi.factor
@@ -14,9 +14,9 @@ library: pango.cairo
     { [ os unix? ] [ "libpangocairo-1.0.so" ] }
 } cond cdecl add-library >>
 
-FOREIGN-RECORD-TYPE: cairo.Context cairo_t
-FOREIGN-RECORD-TYPE: cairo.ScaledFont cairo_scaled_font_t
-FOREIGN-ENUM-TYPE: cairo.FontType cairo_font_type_t
-FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t
+FOREIGN-RECORD-TYPE: cairo.Context cairo_t ;
+FOREIGN-RECORD-TYPE: cairo.ScaledFont cairo_scaled_font_t ;
+FOREIGN-ENUM-TYPE: cairo.FontType cairo_font_type_t ;
+FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t ;
 
 gir: vocab:pango/cairo/PangoCairo-1.0.gir