diff --git a/src/bitfield.h b/src/bitfield.h
index 5d65eb0f..8be27c1b 100644
--- a/src/bitfield.h
+++ b/src/bitfield.h
@@ -11,6 +11,8 @@
 #if !defined __DH_BITFIELD_H__
 #define __DH_BITFIELD_H__
 
+#include <stdint.h>
+
 template class BitField<unsigned int COUNT>
 {
 public:
@@ -36,8 +38,7 @@ public:
 
 
 private:
-    /* FIXME: use uint32_t here instead */
-    unsigned int bits[(COUNT + 31) / 32];
+    uint32_t bits[(COUNT + 31) / 32];
 };
 
 #endif // __DH_BITFIELD_H__
diff --git a/src/gtk/glmapview.cpp b/src/gtk/glmapview.cpp
index 33812dec..945ee95d 100644
--- a/src/gtk/glmapview.cpp
+++ b/src/gtk/glmapview.cpp
@@ -100,7 +100,6 @@ gboolean GlMapView::IdleTick()
         return FALSE;
     }
 
-    // FIXME: do not do anything if the previous tick was too recent?
     ticking = TRUE;
 
     if (mapviewer)
@@ -154,6 +153,8 @@ gboolean GlMapView::Draw(GdkEventExpose *e)
         gtk_gl_area_swapbuffers(GTK_GL_AREA(glarea));
         while (g_main_context_iteration(NULL, FALSE))
             ;
+
+        // FIXME: do some GTK stuff in here
         Ticker::ClampFps(1000.0f / FPS);
     }
 
diff --git a/src/timer.cpp b/src/timer.cpp
index 5c2d0ae3..e19e7e8d 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -67,7 +67,7 @@ private:
         if (update)
             cycles0 = cycles;
         towait = deltams - ret;
-        if (towait > 5e-4f) // FIXME: use native Win32 stuff
+        if (towait > 5e-4f)
             Sleep((int)(towait + 0.5f));
 #else
         /* The crappy SDL fallback */