diff --git a/include/SDL_config_kolibri.h b/include/SDL_config_kolibri.h
index d1a7b48..e2593c8 100644
--- a/include/SDL_config_kolibri.h
+++ b/include/SDL_config_kolibri.h
@@ -92,7 +92,7 @@
 /* Enable the dummy thread support (src/thread/dummy/\*.c) */
 #define SDL_THREADS_DISABLED 1
 
-/* Enable the Kolibri timer support (src/timer/dummy/\*.c) */
+/* Enable the Kolibri timer support (src/timer/kolibri/\*.c) */
 #define SDL_TIMER_KOLIBRI 1
 
 /* Enable the Kolibri video driver (src/video/kolibri/\*.c) */
diff --git a/src/audio/kolibri/SDL_kolibriaudio.c b/src/audio/kolibri/SDL_kolibriaudio.c
index 315d8d2..c8a9292 100644
--- a/src/audio/kolibri/SDL_kolibriaudio.c
+++ b/src/audio/kolibri/SDL_kolibriaudio.c
@@ -236,4 +236,4 @@ AudioBootStrap KOLIBRIAUDIO_bootstrap = {
     KOLIBRIAUDIO_Init, SDL_FALSE
 };
 
-#endif
+#endif /* SDL_AUDIO_DRIVER_KOLIBRI */
diff --git a/src/filesystem/kolibri/SDL_sysfilesystem.c b/src/filesystem/kolibri/SDL_sysfilesystem.c
index 331cf78..3bcf790 100644
--- a/src/filesystem/kolibri/SDL_sysfilesystem.c
+++ b/src/filesystem/kolibri/SDL_sysfilesystem.c
@@ -52,4 +52,4 @@ char *SDL_GetPrefPath(const char *org, const char *app)
     return retval;
 }
 
-#endif
+#endif /* SDL_FILESYSTEM_KOLIBRI */
diff --git a/src/timer/kolibri/SDL_systimer.c b/src/timer/kolibri/SDL_systimer.c
index 57a3aac..d95892d 100644
--- a/src/timer/kolibri/SDL_systimer.c
+++ b/src/timer/kolibri/SDL_systimer.c
@@ -51,4 +51,4 @@ void SDL_Delay(Uint32 ms)
     _ksys_delay((uint32_t)(ms / 10 + (ms % 10 > 0)));
 }
 
-#endif
+#endif /* SDL_TIMER_KOLIBRI */
diff --git a/src/video/kolibri/SDL_kolibriclipboard.c b/src/video/kolibri/SDL_kolibriclipboard.c
index f4b338f..05fc996 100644
--- a/src/video/kolibri/SDL_kolibriclipboard.c
+++ b/src/video/kolibri/SDL_kolibriclipboard.c
@@ -57,4 +57,4 @@ SDL_bool KOLIBRI_HasClipboardText(_THIS)
     return result;
 }
 
-#endif
+#endif /* SDL_VIDEO_DRIVER_KOLIBRI */
diff --git a/src/video/kolibri/SDL_kolibriclipboard.h b/src/video/kolibri/SDL_kolibriclipboard.h
index 82834e0..33a7803 100644
--- a/src/video/kolibri/SDL_kolibriclipboard.h
+++ b/src/video/kolibri/SDL_kolibriclipboard.h
@@ -8,4 +8,4 @@ extern char *KOLIBRI_GetClipboardText(_THIS);
 extern int KOLIBRI_SetClipboardText(_THIS, const char *text);
 extern SDL_bool KOLIBRI_HasClipboardText(_THIS);
 
-#endif
+#endif /* SDL_kolibriclipboard_h_ */
diff --git a/src/video/kolibri/SDL_kolibrievents.c b/src/video/kolibri/SDL_kolibrievents.c
index 4f2ff81..8587ee8 100644
--- a/src/video/kolibri/SDL_kolibrievents.c
+++ b/src/video/kolibri/SDL_kolibrievents.c
@@ -354,4 +354,4 @@ void KOLIBRI_PumpEvents(_THIS)
     }
 }
 
-#endif
+#endif /* SDL_VIDEO_DRIVER_KOLIBRI */
diff --git a/src/video/kolibri/SDL_kolibrievents.h b/src/video/kolibri/SDL_kolibrievents.h
index 4faf8e6..92dcc64 100644
--- a/src/video/kolibri/SDL_kolibrievents.h
+++ b/src/video/kolibri/SDL_kolibrievents.h
@@ -7,4 +7,4 @@
 extern void KOLIBRI_InitOSKeymap(void);
 extern void KOLIBRI_PumpEvents(_THIS);
 
-#endif
+#endif /* SDL_kolibrievents_h_ */
diff --git a/src/video/kolibri/SDL_kolibriframebuffer.c b/src/video/kolibri/SDL_kolibriframebuffer.c
index 6816362..cb1b5f2 100644
--- a/src/video/kolibri/SDL_kolibriframebuffer.c
+++ b/src/video/kolibri/SDL_kolibriframebuffer.c
@@ -76,4 +76,4 @@ void KOLIBRI_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
     data->surface = NULL;
 }
 
-#endif
+#endif /* SDL_VIDEO_DRIVER_KOLIBRI */
diff --git a/src/video/kolibri/SDL_kolibriframebuffer.h b/src/video/kolibri/SDL_kolibriframebuffer.h
index e62385f..f49a887 100644
--- a/src/video/kolibri/SDL_kolibriframebuffer.h
+++ b/src/video/kolibri/SDL_kolibriframebuffer.h
@@ -8,4 +8,4 @@ extern int KOLIBRI_CreateWindowFramebuffer(_THIS, SDL_Window *window, Uint32 *fo
 extern int KOLIBRI_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_Rect *rects, int numrects);
 extern void KOLIBRI_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
 
-#endif
+#endif /* SDL_kolibriframebuffer_h_ */
diff --git a/src/video/kolibri/SDL_kolibrimouse.c b/src/video/kolibri/SDL_kolibrimouse.c
index 51bc8c8..e0d23f6 100644
--- a/src/video/kolibri/SDL_kolibrimouse.c
+++ b/src/video/kolibri/SDL_kolibrimouse.c
@@ -138,4 +138,4 @@ void KOLIBRI_InitMouse(void)
     SDL_SetDefaultCursor(KOLIBRI_CreateDefaultCursor());
 }
 
-#endif
+#endif /* SDL_VIDEO_DRIVER_KOLIBRI */
diff --git a/src/video/kolibri/SDL_kolibrimouse.h b/src/video/kolibri/SDL_kolibrimouse.h
index 6cd8ac4..13748d5 100644
--- a/src/video/kolibri/SDL_kolibrimouse.h
+++ b/src/video/kolibri/SDL_kolibrimouse.h
@@ -13,4 +13,4 @@ typedef struct _KOLIBRI_CursorData
 
 extern void KOLIBRI_InitMouse(void);
 
-#endif
+#endif /* SDL_kolibrimouse_h_ */
diff --git a/src/video/kolibri/SDL_kolibrivideo.c b/src/video/kolibri/SDL_kolibrivideo.c
index 3de88ff..0269436 100644
--- a/src/video/kolibri/SDL_kolibrivideo.c
+++ b/src/video/kolibri/SDL_kolibrivideo.c
@@ -115,4 +115,4 @@ VideoBootStrap KOLIBRI_bootstrap = {
     NULL /* no ShowMessageBox implementation */
 };
 
-#endif
+#endif /* SDL_VIDEO_DRIVER_KOLIBRI */
diff --git a/src/video/kolibri/SDL_kolibrivideo.h b/src/video/kolibri/SDL_kolibrivideo.h
index a97a39e..444582c 100644
--- a/src/video/kolibri/SDL_kolibrivideo.h
+++ b/src/video/kolibri/SDL_kolibrivideo.h
@@ -1,10 +1,10 @@
 
-#ifndef SDL_kolibrivideo_h
-#define SDL_kolibrivideo_h
+#ifndef SDL_kolibrivideo_h_
+#define SDL_kolibrivideo_h_
 
 typedef struct SDL_VideoData
 {
     Uint32 window_id;
 } SDL_VideoData;
 
-#endif
+#endif /* SDL_kolibrivideo_h_ */
diff --git a/src/video/kolibri/SDL_kolibriwindow.c b/src/video/kolibri/SDL_kolibriwindow.c
index 158c61d..7345414 100644
--- a/src/video/kolibri/SDL_kolibriwindow.c
+++ b/src/video/kolibri/SDL_kolibriwindow.c
@@ -86,4 +86,4 @@ void KOLIBRI_DestroyWindow(_THIS, SDL_Window *window)
     SDL_free(window->driverdata);
 }
 
-#endif
+#endif /* SDL_VIDEO_DRIVER_KOLIBRI */
diff --git a/src/video/kolibri/SDL_kolibriwindow.h b/src/video/kolibri/SDL_kolibriwindow.h
index ad5eb90..bf3a202 100644
--- a/src/video/kolibri/SDL_kolibriwindow.h
+++ b/src/video/kolibri/SDL_kolibriwindow.h
@@ -15,4 +15,4 @@ extern void KOLIBRI_RepaintWnd(_THIS);
 extern void KOLIBRI_SetWindowTitle(_THIS, SDL_Window *window);
 extern void KOLIBRI_DestroyWindow(_THIS, SDL_Window *window);
 
-#endif
+#endif /* SDL_kolibriwindow_h_ */