diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc
index 1e903c5..05b16ac 100644
--- a/fofi/FoFiTrueType.cc
+++ b/fofi/FoFiTrueType.cc
@@ -353,7 +353,7 @@ Gushort FoFiTrueType::mapCodeToGID(int i, Guint c) {
   pos = cmaps[i].offset;
   switch (cmaps[i].fmt) {
   case 0:
-    if (c >= cmaps[i].len - 6) {
+    if (c >= (Guint)cmaps[i].len - 6) {
       return 0;
     }
     gid = getU8(cmaps[i].offset + 6 + c, &ok);
@@ -2392,4 +2392,3 @@ int FoFiTrueType::checkGIDInCoverage(Guint coverage, Guint orgGID)
   }
   return index;
 }
-
diff --git a/glib/poppler-annot.cc b/glib/poppler-annot.cc
index b7e5819..31529a1 100644
--- a/glib/poppler-annot.cc
+++ b/glib/poppler-annot.cc
@@ -66,10 +66,10 @@ struct _PopplerAnnotFreeTextClass
   PopplerAnnotMarkupClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerAnnot, poppler_annot, G_TYPE_OBJECT);
-G_DEFINE_TYPE (PopplerAnnotMarkup, poppler_annot_markup, POPPLER_TYPE_ANNOT);
-G_DEFINE_TYPE (PopplerAnnotText, poppler_annot_text, POPPLER_TYPE_ANNOT_MARKUP);
-G_DEFINE_TYPE (PopplerAnnotFreeText, poppler_annot_free_text, POPPLER_TYPE_ANNOT_MARKUP);
+G_DEFINE_TYPE (PopplerAnnot, poppler_annot, G_TYPE_OBJECT)
+G_DEFINE_TYPE (PopplerAnnotMarkup, poppler_annot_markup, POPPLER_TYPE_ANNOT)
+G_DEFINE_TYPE (PopplerAnnotText, poppler_annot_text, POPPLER_TYPE_ANNOT_MARKUP)
+G_DEFINE_TYPE (PopplerAnnotFreeText, poppler_annot_free_text, POPPLER_TYPE_ANNOT_MARKUP)
 
 static void
 poppler_annot_finalize (GObject *object)
diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc
index db77f11..8474ebe 100644
--- a/glib/poppler-attachment.cc
+++ b/glib/poppler-attachment.cc
@@ -36,7 +36,7 @@ struct _PopplerAttachmentPrivate
 
 static void poppler_attachment_finalize (GObject *obj);
 
-G_DEFINE_TYPE (PopplerAttachment, poppler_attachment, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerAttachment, poppler_attachment, G_TYPE_OBJECT)
 
 static void
 poppler_attachment_init (PopplerAttachment *attachment)
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 622aff8..e72adeb 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -59,7 +59,7 @@ struct _PopplerDocumentClass
   GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerDocument, poppler_document, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerDocument, poppler_document, G_TYPE_OBJECT)
 
 static PopplerDocument *
 _poppler_document_new_from_pdfdoc (PDFDoc  *newDoc,
@@ -1275,7 +1275,7 @@ struct _PopplerFontInfoClass
         GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerFontInfo, poppler_font_info, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerFontInfo, poppler_font_info, G_TYPE_OBJECT)
 
 static void poppler_font_info_finalize (GObject *object);
 
@@ -1358,7 +1358,7 @@ struct _PopplerPSFileClass
         GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerPSFile, poppler_ps_file, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerPSFile, poppler_ps_file, G_TYPE_OBJECT)
 
 static void poppler_ps_file_finalize (GObject *object);
 
diff --git a/glib/poppler-form-field.cc b/glib/poppler-form-field.cc
index 47824ae..7bfb2e3 100644
--- a/glib/poppler-form-field.cc
+++ b/glib/poppler-form-field.cc
@@ -27,7 +27,7 @@ struct _PopplerFormFieldClass
   GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerFormField, poppler_form_field, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerFormField, poppler_form_field, G_TYPE_OBJECT)
 
 static void
 poppler_form_field_finalize (GObject *object)
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index cf737cd..a802ca9 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -44,7 +44,7 @@ struct _PopplerPageClass
   GObjectClass parent_class;
 };
 
-G_DEFINE_TYPE (PopplerPage, poppler_page, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PopplerPage, poppler_page, G_TYPE_OBJECT)
 
 PopplerPage *
 _poppler_page_new (PopplerDocument *document, Page *page, int index)
@@ -2004,4 +2004,3 @@ poppler_page_get_crop_box (PopplerPage *page, PopplerRectangle *rect)
   rect->y1 = cropBox->y1;
   rect->y2 = cropBox->y2;
 }
-
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 158b689..ee86fe2 100644
diff --git a/poppler/Annot.h b/poppler/Annot.h
index 6d05823..4a4d967 100644
--- a/poppler/Annot.h
+++ b/poppler/Annot.h
@@ -207,7 +207,7 @@ public:
   enum AnnotBorderType {
     typeUnknown,
     typeArray,
-    typeBS,
+    typeBS
   };
 
   enum AnnotBorderStyle {
@@ -215,7 +215,7 @@ public:
     borderDashed,     // Dashed
     borderBeveled,    // Beveled
     borderInset,      // Inset
-    borderUnderlined, // Underlined
+    borderUnderlined  // Underlined
   };
 
   AnnotBorder();
diff --git a/splash/SplashTypes.h b/splash/SplashTypes.h
index 6a76f77..f863690 100644
--- a/splash/SplashTypes.h
+++ b/splash/SplashTypes.h
@@ -49,7 +49,7 @@ enum SplashColorMode {
 				//   RGBRGB...
   splashModeBGR8,		// 1 byte per component, 3 bytes per pixel:
 				//   BGRBGR...
-  splashModeXBGR8,	// 1 byte per component, 4 bytes per pixel:
+  splashModeXBGR8		// 1 byte per component, 4 bytes per pixel:
 				//   XBGRXBGR...
 #if SPLASH_CMYK
   ,