diff --git a/src/switches.c b/src/switches.c
index 2a3613c..cf55f36 100644
--- a/src/switches.c
+++ b/src/switches.c
@@ -10,19 +10,27 @@
 #include <limits.h>
 #include "system.h"
 #include "debug.h"
-#include "version.h"
 #include "timer.h"
 #include "switches.h"
 #include "error.h"
 #include "specialterm.h"
 
-struct switchdata switches;
+// Program name
+const char *progname = "scyther";
 
+// We only have the version thing under linux
+#ifdef linux
+#include "version.h"
+const char *releasetag = SVNVERSION;
+#else
+const char *releasetag = "Non-linux";
+#endif
+
+// Structures
+struct switchdata switches;
 extern struct tacnode *spdltac;
 
-const char *progname = "scyther";
-const char *releasetag = SVNVERSION;
-
+// Global
 char *lastfoundprefix = NULL;
 
 // Forward declarations
diff --git a/src/timer.c b/src/timer.c
index 81f941e..a0fa7ea 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -1,5 +1,11 @@
 #include "timer.h"
 
+/*
+ * Timer functions
+ *
+ * Currently, this only works under linux (where the linux macro is defined by the compiler). Otherwise, it simply assumes the timer is never passed.
+ */
+
 #ifdef linux
 #include <time.h>
 #include <sys/times.h>
@@ -58,6 +64,6 @@ passed_time_limit ()
 	return 0;
     }
 #else
-    return 0;
+  return 0;
 #endif
 }