diff --git a/ginfo.c b/ginfo.c
index 2d777e3ef..e39361794 100644
--- a/ginfo.c
+++ b/ginfo.c
@@ -619,8 +619,8 @@ signature_offset (GICallableInfo *info)
 
 GITypeInfo *
 g_type_info_new (GIBaseInfo    *container,
-            	 GTypelib      *typelib,
-		         guint32        offset)
+                 GTypelib      *typelib,
+		 guint32        offset)
 {
   SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset];
 
@@ -758,7 +758,7 @@ g_callable_info_get_n_args (GICallableInfo *info)
  */
 GIArgInfo *
 g_callable_info_get_arg (GICallableInfo *info,
-              			 gint           n)
+			 gint           n)
 {
   GIRealInfo *rinfo = (GIRealInfo *)info;
   Header *header = (Header *)rinfo->typelib->data;
@@ -767,7 +767,7 @@ g_callable_info_get_arg (GICallableInfo *info,
   offset = signature_offset (info);
 
   return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, (GIBaseInfo*)info, rinfo->typelib,
-                				   offset + header->signature_blob_size + n * header->arg_blob_size);
+				   offset + header->signature_blob_size + n * header->arg_blob_size);
 }
 
 /**
@@ -1351,7 +1351,7 @@ find_method (GIBaseInfo   *base,
 
       if (strcmp (name, fname) == 0)
         return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base,
-	                        			      rinfo->typelib, offset);
+			                      rinfo->typelib, offset);
 
       offset += header->function_blob_size;
     }
diff --git a/girnode.c b/girnode.c
index afe391319..456ab7388 100644
--- a/girnode.c
+++ b/girnode.c
@@ -1644,9 +1644,9 @@ g_ir_node_build_typelib (GIrNode         *node,
 	blob->name = write_string (node->name, strings, data, offset2);
 	blob->deprecated = prop->deprecated;
 	blob->readable = prop->readable;
- 	blob->writable = prop->writable;
- 	blob->construct = prop->construct;
- 	blob->construct_only = prop->construct_only;
+	blob->writable = prop->writable;
+	blob->construct = prop->construct;
+	blob->construct_only = prop->construct_only;
 	blob->reserved = 0;
 
         g_ir_node_build_typelib ((GIrNode *)prop->type,
@@ -1860,10 +1860,10 @@ g_ir_node_build_typelib (GIrNode         *node,
 	 */
 	*offset += sizeof (ArgBlob) - sizeof (SimpleTypeBlob);
 
- 	blob->name = write_string (node->name, strings, data, offset2);
- 	blob->in = param->in;
- 	blob->out = param->out;
- 	blob->dipper = param->dipper;
+	blob->name = write_string (node->name, strings, data, offset2);
+	blob->in = param->in;
+	blob->out = param->out;
+	blob->dipper = param->dipper;
 	blob->allow_none = param->allow_none;
 	blob->optional = param->optional;
 	blob->transfer_ownership = param->transfer;
diff --git a/gtypelib.h b/gtypelib.h
index 99d4472c8..a69bccf0d 100644
--- a/gtypelib.h
+++ b/gtypelib.h
@@ -556,12 +556,12 @@ typedef struct {
  *
  */
 typedef struct {
-  guint8  	 pointer  :1;
-  guint8  	 reserved :2;
-  guint8  	 tag      :5;
+  guint8	 pointer  :1;
+  guint8	 reserved :2;
+  guint8	 tag      :5;
 
-  guint8  	 reserved2;
-  guint16 	 n_types;
+  guint8	 reserved2;
+  guint16	 n_types;
 
   SimpleTypeBlob type[];
 } ParamTypeBlob;