diff --git a/common/camera.cpp b/common/camera.cpp
index 8f89ac4e..3be69de8 100644
--- a/common/camera.cpp
+++ b/common/camera.cpp
@@ -7,7 +7,6 @@
 #include <float.h>
 #include "lc_file.h"
 #include "camera.h"
-#include "view.h"
 #include "tr.h"
 #include "lc_application.h"
 #include "lc_context.h"
diff --git a/common/camera.h b/common/camera.h
index 7697932f..69b4a697 100644
--- a/common/camera.h
+++ b/common/camera.h
@@ -6,7 +6,6 @@
 #include "lc_array.h"
 
 class TiledRender;
-class View;
 
 #define LC_CAMERA_HIDDEN            0x0001
 #define LC_CAMERA_SIMPLE            0x0002
diff --git a/common/lc_application.cpp b/common/lc_application.cpp
index 7a4d4460..bbcff188 100644
--- a/common/lc_application.cpp
+++ b/common/lc_application.cpp
@@ -1,15 +1,11 @@
 #include "lc_global.h"
 #include <stdio.h>
 #include "lc_application.h"
-#include "lc_colors.h"
 #include "lc_library.h"
 #include "lc_profile.h"
-#include "system.h"
 #include "project.h"
-#include "image.h"
 #include "lc_mainwindow.h"
 #include "lc_shortcuts.h"
-#include "view.h"
 
 lcApplication* g_App;
 
diff --git a/common/lc_application.h b/common/lc_application.h
index 7a7e8f46..ef102679 100644
--- a/common/lc_application.h
+++ b/common/lc_application.h
@@ -2,10 +2,10 @@
 #define _LC_APPLICATION_H_
 
 #include "lc_array.h"
-#include "str.h"
 
 class Project;
 class lcPiecesLibrary;
+class String;
 
 enum lcLightingMode
 {
diff --git a/common/lc_context.h b/common/lc_context.h
index 45600ec5..6e603929 100644
--- a/common/lc_context.h
+++ b/common/lc_context.h
@@ -4,6 +4,7 @@
 #include "lc_array.h"
 #include "lc_math.h"
 #include "lc_colors.h"
+#include "lc_mesh.h"
 
 class lcScene
 {
diff --git a/common/lc_file.cpp b/common/lc_file.cpp
index ba969618..7270e3e7 100644
--- a/common/lc_file.cpp
+++ b/common/lc_file.cpp
@@ -1,6 +1,5 @@
 #include "lc_global.h"
 #include <stdio.h>
-#include <memory.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lc_file.h"
diff --git a/common/lc_global.h b/common/lc_global.h
index e7b6ef7c..088b475e 100644
--- a/common/lc_global.h
+++ b/common/lc_global.h
@@ -43,9 +43,9 @@ int stricmp(const char* str1, const char* str2);
 
 // Version number.
 #define LC_VERSION_MAJOR 0
-#define LC_VERSION_MINOR 82
-#define LC_VERSION_PATCH 2
-#define LC_VERSION_TEXT "0.82.2"
+#define LC_VERSION_MINOR 83
+#define LC_VERSION_PATCH 0
+#define LC_VERSION_TEXT "0.83.0"
 
 // Forward declarations.
 class Project;
diff --git a/common/lc_library.cpp b/common/lc_library.cpp
index 814913cc..616f13f7 100644
--- a/common/lc_library.cpp
+++ b/common/lc_library.cpp
@@ -7,13 +7,10 @@
 #include "lc_texture.h"
 #include "lc_category.h"
 #include "lc_application.h"
-#include "lc_mainwindow.h"
 #include "lc_context.h"
 #include "lc_glextensions.h"
 #include "lc_synth.h"
 #include "project.h"
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <ctype.h>
 #include <locale.h>
 #include <zlib.h>
diff --git a/common/lc_mesh.h b/common/lc_mesh.h
index 0091b4f6..a1ffc63f 100644
--- a/common/lc_mesh.h
+++ b/common/lc_mesh.h
@@ -1,7 +1,6 @@
 #ifndef _LC_MESH_H_
 #define _LC_MESH_H_
 
-#include <stdlib.h>
 #include "lc_math.h"
 
 #define LC_MESH_FILE_ID      LC_FOURCC('M', 'E', 'S', 'H')
diff --git a/common/lc_model.cpp b/common/lc_model.cpp
index 737f703d..bfdb7cf7 100644
--- a/common/lc_model.cpp
+++ b/common/lc_model.cpp
@@ -10,6 +10,7 @@
 #include "lc_library.h"
 #include "lc_texture.h"
 #include "lc_synth.h"
+#include "lc_file.h"
 #include "pieceinf.h"
 #include "view.h"
 #include "preview.h"
diff --git a/common/lc_model.h b/common/lc_model.h
index 625c5ada..0b39eb49 100644
--- a/common/lc_model.h
+++ b/common/lc_model.h
@@ -1,7 +1,6 @@
 #ifndef _LC_MODEL_H_
 #define _LC_MODEL_H_
 
-#include "lc_file.h"
 #include "lc_math.h"
 #include "object.h"
 #include "lc_commands.h"
diff --git a/common/lc_shortcuts.cpp b/common/lc_shortcuts.cpp
index 0bec453e..ae36569c 100644
--- a/common/lc_shortcuts.cpp
+++ b/common/lc_shortcuts.cpp
@@ -1,7 +1,6 @@
 #include "lc_global.h"
 #include "lc_shortcuts.h"
 #include "lc_profile.h"
-#include "system.h"
 
 lcKeyboardShortcuts gKeyboardShortcuts;
 lcMouseShortcuts gMouseShortcuts;
diff --git a/common/lc_texture.cpp b/common/lc_texture.cpp
index 228782b7..81b34af4 100644
--- a/common/lc_texture.cpp
+++ b/common/lc_texture.cpp
@@ -1,6 +1,5 @@
 #include "lc_global.h"
 #include "lc_texture.h"
-#include "lc_file.h"
 #include "lc_application.h"
 #include "lc_library.h"
 #include "image.h"
diff --git a/common/light.cpp b/common/light.cpp
index 8e9c69e3..c9f0bba6 100644
--- a/common/light.cpp
+++ b/common/light.cpp
@@ -1,13 +1,10 @@
 #include "lc_global.h"
 #include "lc_math.h"
 #include "lc_colors.h"
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
 #include "light.h"
-#include "camera.h"
-#include "view.h"
 #include "lc_application.h"
 #include "lc_context.h"
 
diff --git a/common/light.h b/common/light.h
index 3dffc8b6..a4c7d1d3 100644
--- a/common/light.h
+++ b/common/light.h
@@ -4,8 +4,6 @@
 #include "object.h"
 #include "lc_math.h"
 
-class View;
-
 #define LC_LIGHT_HIDDEN            0x0001
 #define LC_LIGHT_DISABLED          0x0002
 #define LC_LIGHT_SPOT              0x0004
diff --git a/common/minifig.cpp b/common/minifig.cpp
index 7197884e..1809b3eb 100644
--- a/common/minifig.cpp
+++ b/common/minifig.cpp
@@ -1,14 +1,12 @@
 #include "lc_global.h"
 #include "lc_colors.h"
 #include "lc_math.h"
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include "minifig.h"
 #include "pieceinf.h"
 #include "project.h"
 #include "lc_model.h"
-#include "system.h"
 #include "lc_library.h"
 #include "lc_application.h"
 #include "lc_context.h"
diff --git a/common/piece.cpp b/common/piece.cpp
index f7967723..c27cd498 100644
--- a/common/piece.cpp
+++ b/common/piece.cpp
@@ -1,15 +1,12 @@
 #include "lc_global.h"
 #include "lc_mesh.h"
 #include "lc_colors.h"
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
 #include "pieceinf.h"
 #include "piece.h"
 #include "group.h"
-#include "project.h"
-#include "lc_model.h"
 #include "lc_file.h"
 #include "lc_application.h"
 #include "lc_library.h"
diff --git a/common/pieceinf.cpp b/common/pieceinf.cpp
index 665d1e34..a2c535b9 100644
--- a/common/pieceinf.cpp
+++ b/common/pieceinf.cpp
@@ -9,7 +9,7 @@
 #include "lc_model.h"
 #include "lc_context.h"
 #include "lc_synth.h"
-#include "camera.h"
+#include "lc_file.h"
 #include <locale.h>
 
 PieceInfo::PieceInfo()
diff --git a/common/pieceinf.h b/common/pieceinf.h
index 1be9ae1f..42143365 100644
--- a/common/pieceinf.h
+++ b/common/pieceinf.h
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include "lc_math.h"
 #include "lc_array.h"
-#include "lc_mesh.h"
 
 #define LC_PIECE_HAS_DEFAULT        0x01 // Piece has triangles using the default color
 #define LC_PIECE_HAS_SOLID          0x02 // Piece has triangles using a solid color
diff --git a/common/preview.cpp b/common/preview.cpp
index 598e98c9..f6eab1f6 100644
--- a/common/preview.cpp
+++ b/common/preview.cpp
@@ -3,7 +3,6 @@
 #include "project.h"
 #include "lc_model.h"
 #include "pieceinf.h"
-#include "system.h"
 #include "lc_application.h"
 #include "lc_mainwindow.h"
 #include "lc_library.h"
diff --git a/common/project.cpp b/common/project.cpp
index 4577f4da..4fd62c61 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -3,11 +3,7 @@
 #include "lc_mesh.h"
 #include <locale.h>
 #include "pieceinf.h"
-#include "lc_texture.h"
-#include "piece.h"
 #include "camera.h"
-#include "light.h"
-#include "group.h"
 #include "project.h"
 #include "image.h"
 #include "lc_mainwindow.h"
@@ -15,6 +11,7 @@
 #include "lc_library.h"
 #include "lc_application.h"
 #include "lc_profile.h"
+#include "lc_file.h"
 #include "preview.h"
 #include "lc_qmodellistdialog.h"
 
diff --git a/common/project.h b/common/project.h
index a34d7794..cee08452 100644
--- a/common/project.h
+++ b/common/project.h
@@ -26,10 +26,6 @@ enum LC_MOUSE_TRACK
 	LC_TRACK_RIGHT
 };
 
-class PieceInfo;
-class View;
-class Image;
-
 class Project
 {
 public:
diff --git a/common/view.cpp b/common/view.cpp
index f72a7844..4a90a4c5 100644
--- a/common/view.cpp
+++ b/common/view.cpp
@@ -1,12 +1,10 @@
 #include "lc_global.h"
 #include <stdlib.h>
 #include "lc_mainwindow.h"
-#include "project.h"
 #include "camera.h"
 #include "view.h"
 #include "system.h"
 #include "tr.h"
-#include "lc_mesh.h"
 #include "texfont.h"
 #include "lc_texture.h"
 #include "preview.h"
diff --git a/common/view.h b/common/view.h
index e5246fba..cc14a033 100644
--- a/common/view.h
+++ b/common/view.h
@@ -2,7 +2,6 @@
 #define _VIEW_H_
 
 #include "lc_glwidget.h"
-#include "lc_model.h"
 #include "camera.h"
 
 enum lcTrackButton
diff --git a/qt/qtmain.cpp b/qt/qtmain.cpp
index 4da4bb41..8b3dd5ce 100644
--- a/qt/qtmain.cpp
+++ b/qt/qtmain.cpp
@@ -2,7 +2,6 @@
 #include "lc_application.h"
 #include "lc_qupdatedialog.h"
 #include "lc_mainwindow.h"
-#include "view.h"
 #include "project.h"
 #include "lc_colors.h"
 #include <QApplication>