diff --git a/src/openrct2/paint/sprite/sprite.c b/src/openrct2/paint/sprite/sprite.c
index cf9482bf1a..3bbf720dba 100644
--- a/src/openrct2/paint/sprite/sprite.c
+++ b/src/openrct2/paint/sprite/sprite.c
@@ -21,7 +21,6 @@
 #include "../../ride/ride_data.h"
 #include "../../interface/viewport.h"
 #include "../../ride/vehicle_paint.h"
-#include "../../localisation/localisation.h"
 
 /**
  * Paint Quadrant
diff --git a/src/openrct2/windows/themes.c b/src/openrct2/windows/themes.c
index c5c1a37729..70467d57fb 100644
--- a/src/openrct2/windows/themes.c
+++ b/src/openrct2/windows/themes.c
@@ -234,6 +234,7 @@ static rct_windowclass window_themes_tab_5_classes[] = {
 static rct_windowclass window_themes_tab_6_classes[] = {
 	WC_CHEATS,
 	WC_TILE_INSPECTOR,
+	WC_VIEW_CLIPPING,
 	WC_THEMES,
 	WC_TITLE_EDITOR,
 	WC_OPTIONS,
@@ -245,7 +246,6 @@ static rct_windowclass window_themes_tab_6_classes[] = {
 	WC_MULTIPLAYER,
 	WC_PLAYER,
 	WC_CHAT,
-	WC_VIEW_CLIPPING,
 };
 
 static rct_windowclass window_themes_tab_7_classes[] = {
diff --git a/src/openrct2/windows/view_clipping.c b/src/openrct2/windows/view_clipping.c
index 218f237346..534734324a 100644
--- a/src/openrct2/windows/view_clipping.c
+++ b/src/openrct2/windows/view_clipping.c
@@ -1,4 +1,4 @@
-#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers
+#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers
 /*****************************************************************************
  * OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
  *
@@ -35,8 +35,8 @@ enum WINDOW_VIEW_CLIPPING_WIDGET_IDX {
 };
 
 typedef enum DISPLAY_TYPE {
-	DISPLAY_RAW = 0,
-	DISPLAY_UNITS = 1
+	DISPLAY_RAW,
+	DISPLAY_UNITS
 } clip_value_display_type;
 
 clip_value_display_type gClipHeightDisplayType = DISPLAY_UNITS;
@@ -198,7 +198,7 @@ static void window_view_clipping_mouseup(rct_window *w, int widgetIndex)
 			window_invalidate(mainWindow);
 		break;
 	case WIDX_CLIP_HEIGHT_DECREASE:
-		if(gClipHeight > 0)
+		if (gClipHeight > 0)
 			window_view_clipping_set_clipheight(w, gClipHeight - 1);
 		mainWindow = window_get_main();
 		if (mainWindow != NULL)