diff --git a/FL/filename.H b/FL/filename.H
index 29d0bcf91..9f4d9ab0f 100644
--- a/FL/filename.H
+++ b/FL/filename.H
@@ -25,8 +25,9 @@
  *     http://www.fltk.org/str.php
  */
 
-// Xcode on OS X includes files by recursing down into directories.
-// This code catches the cycle and directly includes the required file.
+/* Xcode on OS X includes files by recursing down into directories.
+ * This code catches the cycle and directly includes the required file.
+ */
 #ifdef fl_dirent_h_cyclic_include 
 #  include "/usr/include/dirent.h"
 #endif
diff --git a/src/Fl_Paged_Device.cxx b/src/Fl_Paged_Device.cxx
index d65f7983b..0af786dd9 100644
--- a/src/Fl_Paged_Device.cxx
+++ b/src/Fl_Paged_Device.cxx
@@ -149,7 +149,8 @@ void Fl_Paged_Device::print_window_part(Fl_Window *win, int x, int y, int w, int
   }  
   save_front->show();
   current->set_current();
-  for ( int i = 0, offset = 0; i < count; i++, offset += slice) {
+  offset = 0;
+  for ( int i = 0; i < count; i++, offset += slice) {
     width = slice; 
     if (offset + width > w) width = w - offset;
     fl_draw_image(image_data[i], delta_x + offset, delta_y, width, h, 3);