From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 9 Oct 2021 11:11:09 +0000 (+0300)
Subject: Use default member initializers for simple types
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

Use default member initializers for simple types

Also mark special member functions as defaulted instead of defining them
as empty.
---

diff --git a/source/animation/animation.cpp b/source/animation/animation.cpp
index 98cfdc87..76d9552e 100644
--- a/source/animation/animation.cpp
+++ b/source/animation/animation.cpp
@@ -16,11 +16,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Animation::Animation():
-	armature(0),
-	looping(false)
-{ }
-
 Animation::~Animation()
 {
 	for(TimedKeyFrame &k: keyframes)
diff --git a/source/animation/animation.h b/source/animation/animation.h
index eb5911c3..7d55bb61 100644
--- a/source/animation/animation.h
+++ b/source/animation/animation.h
@@ -163,16 +163,15 @@ public:
 	};
 
 private:
-	const Armature *armature;
+	const Armature *armature = 0;
 	std::vector<TimedKeyFrame> keyframes;
 	std::vector<Event> events;
-	bool looping;
+	bool looping = false;
 	std::vector<UniformInfo> uniforms;
 	std::vector<Curve *> curves;
-	unsigned uniform_curve_offset;
+	unsigned uniform_curve_offset = 0;
 
 public:
-	Animation();
 	~Animation();
 
 	void set_armature(const Armature &);
diff --git a/source/animation/animationeventobserver.h b/source/animation/animationeventobserver.h
index 1eafc4d2..b1d57e97 100644
--- a/source/animation/animationeventobserver.h
+++ b/source/animation/animationeventobserver.h
@@ -12,9 +12,9 @@ class Placeable;
 class AnimationEventObserver
 {
 protected:
-	AnimationEventObserver() { }
+	AnimationEventObserver() = default;
 public:
-	virtual ~AnimationEventObserver() { }
+	virtual ~AnimationEventObserver() = default;
 
 	virtual void animation_event(Placeable *, const std::string &, const Variant &) { }
 };
diff --git a/source/animation/keyframe.cpp b/source/animation/keyframe.cpp
index 3f3dea28..d1f1a7ea 100644
--- a/source/animation/keyframe.cpp
+++ b/source/animation/keyframe.cpp
@@ -8,13 +8,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-// Avoid synthesizing RefPtr c'tor and d'tor in files including keyframe.h
-KeyFrame::KeyFrame()
-{ }
-
-KeyFrame::~KeyFrame()
-{ }
-
 void KeyFrame::set_transform(const Transform &t)
 {
 	transform = t;
diff --git a/source/animation/keyframe.h b/source/animation/keyframe.h
index 26d18534..5e70aa73 100644
--- a/source/animation/keyframe.h
+++ b/source/animation/keyframe.h
@@ -67,12 +67,9 @@ public:
 private:
 	Transform transform;
 	UniformMap uniforms;
-	const Pose *pose;
+	const Pose *pose = 0;
 
 public:
-	KeyFrame();
-	~KeyFrame();
-
 	void set_transform(const Transform &);
 	void set_matrix(const Matrix &);
 	void set_uniform(const std::string &, const AnimatedUniform &);
diff --git a/source/animation/pose.cpp b/source/animation/pose.cpp
index 99fa6bb3..2faecad3 100644
--- a/source/animation/pose.cpp
+++ b/source/animation/pose.cpp
@@ -8,12 +8,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Pose::Pose():
-	armature(0)
-{ }
-
-Pose::Pose(const Armature &a):
-	armature(0)
+Pose::Pose(const Armature &a)
 {
 	set_armature(a);
 }
diff --git a/source/animation/pose.h b/source/animation/pose.h
index cbd8137b..d0c127ed 100644
--- a/source/animation/pose.h
+++ b/source/animation/pose.h
@@ -40,11 +40,11 @@ private:
 		void rotation(float, float, float, float);
 	};
 
-	const Armature *armature;
+	const Armature *armature = 0;
 	std::vector<Link> links;
 
 public:
-	Pose();
+	Pose() = default;
 	Pose(const Armature &);
 
 	void set_armature(const Armature &);
diff --git a/source/animation/transform.cpp b/source/animation/transform.cpp
index b703a5b1..4c8e1564 100644
--- a/source/animation/transform.cpp
+++ b/source/animation/transform.cpp
@@ -3,13 +3,6 @@
 namespace Msp {
 namespace GL {
 
-Transform::Transform():
-	position(0.0f, 0.0f, 0.0f),
-	euler(Angle::zero(), Angle::zero(), Angle::zero()),
-	scale(1.0f, 1.0f, 1.0f),
-	mask(NONE)
-{ }
-
 Transform Transform::from_matrix(const Matrix &matrix)
 {
 	Transform trn;
diff --git a/source/animation/transform.h b/source/animation/transform.h
index 1d0aeddd..5854c417 100644
--- a/source/animation/transform.h
+++ b/source/animation/transform.h
@@ -60,12 +60,10 @@ public:
 private:
 	Vector3 position;
 	AngleVector3 euler;
-	Vector3 scale;
-	ComponentMask mask;
+	Vector3 scale = { 1.0f, 1.0f, 1.0f };
+	ComponentMask mask = NONE;
 
 public:
-	Transform();
-
 	static Transform from_matrix(const Matrix &);
 
 	void set_position(const Vector3 &);
diff --git a/source/backends/opengl/buffer_backend.h b/source/backends/opengl/buffer_backend.h
index 7162a26b..5db516fb 100644
--- a/source/backends/opengl/buffer_backend.h
+++ b/source/backends/opengl/buffer_backend.h
@@ -13,7 +13,7 @@ class OpenGLBuffer: public NonCopyable
 	friend class OpenGLVertexSetup;
 
 protected:
-	unsigned id;
+	unsigned id = 0;
 
 	static OpenGLBuffer *scratch_binding;
 
diff --git a/source/backends/opengl/commands_backend.cpp b/source/backends/opengl/commands_backend.cpp
index e9fa8b7c..adecd5c8 100644
--- a/source/backends/opengl/commands_backend.cpp
+++ b/source/backends/opengl/commands_backend.cpp
@@ -18,10 +18,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-OpenGLCommands::OpenGLCommands():
-	pipeline_state(0)
-{ }
-
 void OpenGLCommands::use_pipeline(const PipelineState *ps)
 {
 	pipeline_state = ps;
diff --git a/source/backends/opengl/commands_backend.h b/source/backends/opengl/commands_backend.h
index f54b27a1..0fe989a7 100644
--- a/source/backends/opengl/commands_backend.h
+++ b/source/backends/opengl/commands_backend.h
@@ -13,9 +13,9 @@ class QueryPool;
 class OpenGLCommands
 {
 protected:
-	const PipelineState *pipeline_state;
+	const PipelineState *pipeline_state = 0;
 
-	OpenGLCommands();
+	OpenGLCommands() = default;
 
 	void use_pipeline(const PipelineState *);
 	void clear(const ClearValue *);
diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index 3b1c4293..4dbf38a7 100644
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -38,13 +38,11 @@ void uniform_matrix_wrapper(unsigned index, unsigned count, const void *data)
 namespace Msp {
 namespace GL {
 
-OpenGLProgram::OpenGLProgram():
-	linked(false)
+OpenGLProgram::OpenGLProgram()
 {
 	static Require _req(ARB_shader_objects);
 
 	id = glCreateProgram();
-	fill(stage_ids, stage_ids+MAX_STAGES, 0);
 }
 
 OpenGLProgram::~OpenGLProgram()
diff --git a/source/backends/opengl/program_backend.h b/source/backends/opengl/program_backend.h
index 4ae729e2..95df9891 100644
--- a/source/backends/opengl/program_backend.h
+++ b/source/backends/opengl/program_backend.h
@@ -40,9 +40,9 @@ protected:
 		UniformCall(unsigned l, unsigned s, FuncPtr f): location(l), size(s), func(f) { }
 	};
 
-	unsigned id;
-	unsigned stage_ids[MAX_STAGES];
-	bool linked;
+	unsigned id = 0;
+	unsigned stage_ids[MAX_STAGES] = { };
+	bool linked = false;
 	std::vector<UniformCall> uniform_calls;
 	std::string debug_name;
 
diff --git a/source/backends/opengl/sampler_backend.h b/source/backends/opengl/sampler_backend.h
index 77590c25..20ad4b6c 100644
--- a/source/backends/opengl/sampler_backend.h
+++ b/source/backends/opengl/sampler_backend.h
@@ -9,7 +9,7 @@ class OpenGLSampler
 	friend class OpenGLPipelineState;
 
 protected:
-	unsigned id;
+	unsigned id = 0;
 
 	OpenGLSampler();
 
diff --git a/source/backends/opengl/texture_backend.cpp b/source/backends/opengl/texture_backend.cpp
index e8288045..88e1c2b3 100644
--- a/source/backends/opengl/texture_backend.cpp
+++ b/source/backends/opengl/texture_backend.cpp
@@ -23,7 +23,6 @@ int OpenGLTexture::swizzle_orders[] =
 OpenGLTexture *OpenGLTexture::scratch_binding = 0;
 
 OpenGLTexture::OpenGLTexture(unsigned t):
-	id(0),
 	target(t)
 {
 	static bool alignment_init = false;
diff --git a/source/backends/opengl/texture_backend.h b/source/backends/opengl/texture_backend.h
index 81577820..a18b7bf8 100644
--- a/source/backends/opengl/texture_backend.h
+++ b/source/backends/opengl/texture_backend.h
@@ -12,7 +12,7 @@ class OpenGLTexture: public NonCopyable
 	friend class OpenGLPipelineState;
 
 protected:
-	unsigned id;
+	unsigned id = 0;
 	unsigned target;
 	std::string debug_name;
 
diff --git a/source/builders/font.cpp b/source/builders/font.cpp
index 4fb64352..58b23fe9 100644
--- a/source/builders/font.cpp
+++ b/source/builders/font.cpp
@@ -10,18 +10,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Font::Font():
-	native_size(1),
-	ascent(1),
-	descent(0),
-	cap_height(1),
-	x_height(0.5)
-{ }
-
-// Avoid synthesizing ~RefPtr in files including font.h
-Font::~Font()
-{ }
-
 void Font::set_texture(const Texture2D &t)
 {
 	texture = &t;
@@ -129,20 +117,6 @@ unsigned Font::get_ligature(unsigned code, unsigned next) const
 }
 
 
-Font::Glyph::Glyph():
-	code(0),
-	x1(0),
-	y1(0),
-	x2(1),
-	y2(1),
-	w(1),
-	h(1),
-	off_x(0),
-	off_y(0),
-	advance(1)
-{ }
-
-
 Font::Loader::Loader(Font &f, Collection &c):
 	DataFile::CollectionObjectLoader<Font>(f, &c)
 {
diff --git a/source/builders/font.h b/source/builders/font.h
index f46a2870..adbfc828 100644
--- a/source/builders/font.h
+++ b/source/builders/font.h
@@ -41,14 +41,16 @@ public:
 			void texcoords(float, float, float, float);
 		};
 
-		unsigned code;
-		float x1, y1;
-		float x2, y2;
-		float w, h;
-		float off_x, off_y;
-		float advance;
-
-		Glyph();
+		unsigned code = 0;
+		float x1 = 0.0f;
+		float y1 = 0.0f;
+		float x2 = 1.0f;
+		float y2 = 1.0f;
+		float w = 1.0f;
+		float h = 1.0f;
+		float off_x = 0.0f;
+		float off_y = 0.0f;
+		float advance = 1.0f;
 	};
 
 private:
@@ -57,20 +59,17 @@ private:
 	typedef std::map<CodePair, float> KerningMap;
 	typedef std::map<CodePair, unsigned> LigatureMap;
 
-	const Texture2D *texture;
-	float native_size;
-	float ascent;
-	float descent;
-	float cap_height;
-	float x_height;
+	const Texture2D *texture = 0;
+	float native_size = 1.0f;
+	float ascent = 1.0f;
+	float descent = 0.0f;
+	float cap_height = 1.0f;
+	float x_height = 0.5f;
 	GlyphMap glyphs;
 	KerningMap kerning;
 	LigatureMap ligatures;
 
 public:
-	Font();
-	~Font();
-
 	void set_texture(const Texture2D &);
 	const Texture2D &get_texture() const;
 
diff --git a/source/builders/geometrybuilder.cpp b/source/builders/geometrybuilder.cpp
index 8e0ae53b..52d05fae 100644
--- a/source/builders/geometrybuilder.cpp
+++ b/source/builders/geometrybuilder.cpp
@@ -4,11 +4,6 @@
 namespace Msp {
 namespace GL {
 
-GeometryBuilder::GeometryBuilder():
-	generate_tan(false),
-	tex_fit(STRETCH)
-{ }
-
 GeometryBuilder &GeometryBuilder::tangents(bool t)
 {
 	generate_tan = t;
diff --git a/source/builders/geometrybuilder.h b/source/builders/geometrybuilder.h
index 87dd4e22..04b26251 100644
--- a/source/builders/geometrybuilder.h
+++ b/source/builders/geometrybuilder.h
@@ -20,10 +20,10 @@ public:
 	};
 
 protected:
-	bool generate_tan;
-	TextureFit tex_fit;
+	bool generate_tan = false;
+	TextureFit tex_fit = STRETCH;
 
-	GeometryBuilder();
+	GeometryBuilder() = default;
 
 public:
 	DEPRECATED GeometryBuilder &tbn(bool t = true) { return tangents(t); }
diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index 5d7f4d0b..e8e451fc 100644
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -16,16 +16,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-SequenceTemplate::SequenceTemplate():
-	hdr(false),
-	alpha(false),
-	required_multisample(0),
-	max_multisample(0),
-	clear_enabled(false),
-	clear_depth(1.0f),
-	clear_stencil(0)
-{ }
-
 SequenceTemplate::~SequenceTemplate()
 {
 	for(const PostProcessor &p: postprocessors)
@@ -48,10 +38,6 @@ SequenceTemplate::PostProcessorRegistry &SequenceTemplate::get_postprocessor_reg
 }
 
 
-SequenceTemplate::Step::~Step()
-{ }
-
-
 SequenceTemplate::PostProcessor::PostProcessor(GL::PostProcessor::Template *ppt):
 	postprocessor_template(ppt)
 { }
diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 52c42bb1..972a6b0b 100644
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -87,14 +87,12 @@ public:
 		};
 
 		std::string tag;
-		const Lighting *lighting;
+		const Lighting *lighting = 0;
 		DepthTest depth_test;
 		StencilTest stencil_test;
 		Blend blend;
 		std::string slot_name;
-		Renderable *default_renderable;
-
-		~Step();
+		Renderable *default_renderable = 0;
 	};
 
 	struct PostProcessor
@@ -119,19 +117,18 @@ private:
 
 	typedef TypeRegistry<PostProcLoader::AddPostProc, PostProcLoader &> PostProcessorRegistry;
 
-	bool hdr;
-	bool alpha;
-	unsigned required_multisample;
-	unsigned max_multisample;
+	bool hdr = false;
+	bool alpha = false;
+	unsigned required_multisample = 0;
+	unsigned max_multisample = 0;
 	std::vector<Step> steps;
 	std::vector<PostProcessor> postprocessors;
-	bool clear_enabled;
+	bool clear_enabled = false;
 	std::vector<Color> clear_colors;
-	float clear_depth;
-	int clear_stencil;
+	float clear_depth = 1.0f;
+	int clear_stencil = 0;
 
 public:
-	SequenceTemplate();
 	~SequenceTemplate();
 
 	bool get_hdr() const { return hdr; }
diff --git a/source/builders/vertexbuilder.h b/source/builders/vertexbuilder.h
index 49a20b5c..09d9ed60 100644
--- a/source/builders/vertexbuilder.h
+++ b/source/builders/vertexbuilder.h
@@ -40,7 +40,7 @@ protected:
 public:
 	VertexBuilder() { normal(0, 0, 1); }
 
-	virtual ~VertexBuilder() { }
+	virtual ~VertexBuilder() = default;
 
 	void set_matrix(const Matrix &m)
 	{ mtx = m; }
diff --git a/source/core/backend.cpp b/source/core/backend.cpp
index ac9e22b7..2e8f6b42 100644
--- a/source/core/backend.cpp
+++ b/source/core/backend.cpp
@@ -7,12 +7,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Version::Version()
-{
-	major = 0;
-	minor = 0;
-}
-
 Version::Version(unsigned short a, unsigned short i)
 {
 	major = a;
diff --git a/source/core/backend.h b/source/core/backend.h
index 0dd0172c..ef04bd11 100644
--- a/source/core/backend.h
+++ b/source/core/backend.h
@@ -14,10 +14,10 @@ enum GraphicsApi
 
 struct Version
 {
-	unsigned short major;
-	unsigned short minor;
+	unsigned short major = 0;
+	unsigned short minor = 0;
 
-	Version();
+	Version() = default;
 	Version(unsigned short, unsigned short);
 	Version(const std::string &);
 
diff --git a/source/core/blend.cpp b/source/core/blend.cpp
index 85d3e57d..99ffcd07 100644
--- a/source/core/blend.cpp
+++ b/source/core/blend.cpp
@@ -7,31 +7,17 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Blend::Blend():
-	enabled(false),
-	equation(ADD),
-	src_factor(ONE),
-	dst_factor(ZERO),
-	constant(0.0f, 0.0f, 0.0f, 0.0f),
-	write_mask(WRITE_ALL)
-{ }
-
 Blend::Blend(BlendFactor sf, BlendFactor df):
 	enabled(true),
-	equation(ADD),
 	src_factor(sf),
-	dst_factor(df),
-	constant(0.0f, 0.0f, 0.0f, 0.0f),
-	write_mask(WRITE_ALL)
+	dst_factor(df)
 { }
 
 Blend::Blend(BlendEquation e, BlendFactor sf, BlendFactor df):
 	enabled(true),
 	equation(e),
 	src_factor(sf),
-	dst_factor(df),
-	constant(0.0f, 0.0f, 0.0f, 0.0f),
-	write_mask(WRITE_ALL)
+	dst_factor(df)
 { }
 
 
diff --git a/source/core/blend.h b/source/core/blend.h
index e04aef49..1d39b08f 100644
--- a/source/core/blend.h
+++ b/source/core/blend.h
@@ -61,14 +61,14 @@ struct Blend
 		void factors(BlendFactor, BlendFactor);
 	};
 
-	bool enabled;
-	BlendEquation equation;
-	BlendFactor src_factor;
-	BlendFactor dst_factor;
-	Color constant;
-	ColorWriteMask write_mask;
-
-	Blend();
+	bool enabled = false;
+	BlendEquation equation = ADD;
+	BlendFactor src_factor = ONE;
+	BlendFactor dst_factor = ZERO;
+	Color constant = { 0.0f, 0.0f, 0.0f, 0.0f };
+	ColorWriteMask write_mask = WRITE_ALL;
+
+	Blend() = default;
 	Blend(BlendFactor, BlendFactor);
 	Blend(BlendEquation, BlendFactor, BlendFactor);
 };
diff --git a/source/core/buffer.cpp b/source/core/buffer.cpp
index 811b3e41..523b737d 100644
--- a/source/core/buffer.cpp
+++ b/source/core/buffer.cpp
@@ -8,10 +8,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Buffer::Buffer():
-	size(0)
-{ }
-
 void Buffer::storage(unsigned sz)
 {
 	if(size>0)
diff --git a/source/core/buffer.h b/source/core/buffer.h
index 9737a2ea..7682347f 100644
--- a/source/core/buffer.h
+++ b/source/core/buffer.h
@@ -27,11 +27,9 @@ class Buffer: public BufferBackend
 	friend BufferBackend;
 
 private:
-	unsigned size;
+	unsigned size = 0;
 
 public:
-	Buffer();
-
 	/** Defines the storage size of the buffer.  Must be called before data can
 	be uploaded.  Storage cannot be changed once set. */
 	void storage(unsigned);
diff --git a/source/core/bufferable.cpp b/source/core/bufferable.cpp
index abbde263..8f967df7 100644
--- a/source/core/bufferable.cpp
+++ b/source/core/bufferable.cpp
@@ -7,15 +7,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Bufferable::Bufferable():
-	buffer(0),
-	offset(0),
-	next_in_buffer(0),
-	prev_in_buffer(0),
-	location_dirty(false),
-	dirty(false)
-{ }
-
 Bufferable::~Bufferable()
 {
 	unlink_from_buffer();
diff --git a/source/core/bufferable.h b/source/core/bufferable.h
index 47e2770c..c7e26aef 100644
--- a/source/core/bufferable.h
+++ b/source/core/bufferable.h
@@ -29,15 +29,15 @@ public:
 	};
 
 private:
-	Buffer *buffer;
-	unsigned offset;
-	Bufferable *next_in_buffer;
-	Bufferable *prev_in_buffer;
-	mutable bool location_dirty;
+	Buffer *buffer = 0;
+	unsigned offset = 0;
+	Bufferable *next_in_buffer = 0;
+	Bufferable *prev_in_buffer = 0;
+	mutable bool location_dirty = false;
 protected:
-	mutable bool dirty;
+	mutable bool dirty = false;
 
-	Bufferable();
+	Bufferable() = default;
 public:
 	virtual ~Bufferable();
 
diff --git a/source/core/clipplane.cpp b/source/core/clipplane.cpp
index fe784d25..256f2bea 100644
--- a/source/core/clipplane.cpp
+++ b/source/core/clipplane.cpp
@@ -5,19 +5,12 @@
 namespace Msp {
 namespace GL {
 
-ClipPlane::ClipPlane():
-	eq(0, 0, 0, 1),
-	generation(0)
-{ }
-
 ClipPlane::ClipPlane(const Vector4 &e):
-	eq(e),
-	generation(0)
+	eq(e)
 { }
 
 ClipPlane::ClipPlane(const Vector3 &p, const Vector3 &d):
-	eq(compose(d, -dot(p, d))),
-	generation(0)
+	eq(compose(d, -dot(p, d)))
 { }
 
 void ClipPlane::set_equation(const Vector4 &e)
diff --git a/source/core/clipplane.h b/source/core/clipplane.h
index 2cf9b18b..a2b56255 100644
--- a/source/core/clipplane.h
+++ b/source/core/clipplane.h
@@ -11,11 +11,11 @@ class ProgramData;
 class ClipPlane
 {
 private:
-	Vector4 eq;
-	unsigned generation;
+	Vector4 eq = { 0.0f, 0.0f, 0.0f, 1.0f };
+	unsigned generation = 0;
 
 public:
-	ClipPlane();
+	ClipPlane() = default;
 	ClipPlane(const Vector4 &);
 	ClipPlane(const Vector3 &, const Vector3 &);
 
diff --git a/source/core/color.h b/source/core/color.h
index e57689bf..e376e330 100644
--- a/source/core/color.h
+++ b/source/core/color.h
@@ -14,11 +14,14 @@ inline float to_linear(float c)
 
 struct Color
 {
-	float r, g, b, a;
-
-	Color(): r(1), g(1), b(1), a(1) { }
-	Color(float v): r(v), g(v), b(v), a(1) { }
-	Color(float r_, float g_, float b_): r(r_), g(g_), b(b_), a(1) { }
+	float r = 1.0f;
+	float g = 1.0f;
+	float b = 1.0f;
+	float a = 1.0f;
+
+	Color() = default;
+	Color(float v): r(v), g(v), b(v) { }
+	Color(float r_, float g_, float b_): r(r_), g(g_), b(b_) { }
 	Color(float r_, float g_, float b_, float a_): r(r_), g(g_), b(b_), a(a_) { }
 	Color operator*(float f) const { return Color(r*f, g*f, b*f, a); }
 	Color operator+(const Color &c) const { return Color(r+c.r, g+c.g, b+c.b, 1-(1-a)*(1-c.a)); }
diff --git a/source/core/depthtest.cpp b/source/core/depthtest.cpp
index 5ae4f728..dcd76023 100644
--- a/source/core/depthtest.cpp
+++ b/source/core/depthtest.cpp
@@ -5,12 +5,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-DepthTest::DepthTest():
-	enabled(false),
-	compare(LESS),
-	write(true)
-{ }
-
 DepthTest::DepthTest(Predicate c, bool w):
 	enabled(true),
 	compare(c),
diff --git a/source/core/depthtest.h b/source/core/depthtest.h
index d79f06e8..e6f1349a 100644
--- a/source/core/depthtest.h
+++ b/source/core/depthtest.h
@@ -22,11 +22,11 @@ struct DepthTest
 		void compare(Predicate);
 	};
 
-	bool enabled;
-	Predicate compare;
-	bool write;
+	bool enabled = false;
+	Predicate compare = LESS;
+	bool write = true;
 
-	DepthTest();
+	DepthTest() = default;
 	DepthTest(Predicate, bool = true);
 };
 
diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index 61327723..cc8dec4f 100644
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -208,12 +208,6 @@ Framebuffer &Framebuffer::system()
 }
 
 
-Framebuffer::Attachment::Attachment():
-	tex(0),
-	level(0),
-	layer(0)
-{ }
-
 void Framebuffer::Attachment::set(Texture &t, unsigned l, int z)
 {
 	tex = &t;
diff --git a/source/core/framebuffer.h b/source/core/framebuffer.h
index 0b9af1ef..e370b7c7 100644
--- a/source/core/framebuffer.h
+++ b/source/core/framebuffer.h
@@ -41,11 +41,10 @@ class Framebuffer: public FramebufferBackend
 private:
 	struct Attachment
 	{
-		Texture *tex;
-		unsigned level;
-		int layer;
+		Texture *tex = 0;
+		unsigned level = 0;
+		int layer = 0;
 
-		Attachment();
 		void set(Texture &, unsigned, int);
 		void clear();
 	};
diff --git a/source/core/frameformat.cpp b/source/core/frameformat.cpp
index 36b45f61..7fe17933 100644
--- a/source/core/frameformat.cpp
+++ b/source/core/frameformat.cpp
@@ -8,11 +8,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-FrameFormat::FrameFormat():
-	count(0),
-	samples(1)
-{ }
-
 FrameFormat::FrameFormat(FrameAttachment fa):
 	count(1),
 	samples(1)
diff --git a/source/core/frameformat.h b/source/core/frameformat.h
index 90132092..df436375 100644
--- a/source/core/frameformat.h
+++ b/source/core/frameformat.h
@@ -36,12 +36,12 @@ class FrameFormat
 private:
 	enum { MAX_ATTACHMENTS = 7 };
 
-	std::uint8_t count;
-	std::uint8_t samples;
+	std::uint8_t count = 0;
+	std::uint8_t samples = 0;
 	FrameAttachment attachments[MAX_ATTACHMENTS];
 
 public:
-	FrameFormat();
+	FrameFormat() = default;
 	FrameFormat(FrameAttachment);
 
 	FrameFormat operator,(FrameAttachment) const;
diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 1e811b5b..4679e3a3 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -9,14 +9,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Mesh::Mesh():
-	vbuf(0),
-	ibuf(0),
-	dirty(0),
-	disallow_rendering(false),
-	face_winding(NON_MANIFOLD)
-{ }
-
 Mesh::Mesh(const VertexFormat &f):
 	Mesh()
 {
diff --git a/source/core/mesh.h b/source/core/mesh.h
index 89f51fdd..2d56193d 100644
--- a/source/core/mesh.h
+++ b/source/core/mesh.h
@@ -66,16 +66,16 @@ private:
 
 	VertexArray vertices;
 	std::vector<Batch> batches;
-	Buffer *vbuf;
-	Buffer *ibuf;
+	Buffer *vbuf = 0;
+	Buffer *ibuf = 0;
 	VertexSetup vtx_setup;
-	mutable unsigned short dirty;
-	bool disallow_rendering;
-	FaceWinding face_winding;
+	mutable unsigned short dirty = 0;
+	bool disallow_rendering = false;
+	FaceWinding face_winding = NON_MANIFOLD;
 	std::string debug_name;
 
 public:
-	Mesh();
+	Mesh() = default;
 	Mesh(const VertexFormat &);
 	~Mesh();
 
diff --git a/source/core/module.cpp b/source/core/module.cpp
index ed5f0282..eaed8a45 100644
--- a/source/core/module.cpp
+++ b/source/core/module.cpp
@@ -245,30 +245,6 @@ void SpirVModule::reflect()
 }
 
 
-SpirVModule::EntryPoint::EntryPoint():
-	stage(VERTEX)
-{ }
-
-
-SpirVModule::StructMember::StructMember():
-	type(VOID),
-	struct_type(0),
-	offset(0),
-	array_size(0),
-	array_size_spec(0),
-	array_stride(0),
-	matrix_stride(0)
-{ }
-
-
-SpirVModule::Variable::Variable():
-	type(VOID),
-	struct_type(0),
-	location(-1),
-	descriptor_set(-1),
-	binding(-1)
-{ }
-
 bool SpirVModule::Variable::operator==(const Variable &other) const
 {
 	if(storage!=UNIFORM_CONSTANT && storage!=UNIFORM)
@@ -281,16 +257,6 @@ bool SpirVModule::Variable::operator==(const Variable &other) const
 }
 
 
-SpirVModule::TypeInfo::TypeInfo():
-	type(VOID),
-	struct_type(0),
-	array_size_spec(0),
-	array_size(0),
-	array_stride(0),
-	storage(static_cast<StorageClass>(-1))
-{ }
-
-
 uint32_t SpirVModule::Reflection::get_opcode(uint32_t op)
 {
 	return op&0xFFFF;
diff --git a/source/core/module.h b/source/core/module.h
index 34553b44..7713d3ce 100644
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -31,9 +31,9 @@ public:
 	};
 
 protected:
-	Module() { }
+	Module() = default;
 public:
-	virtual ~Module() { }
+	virtual ~Module() = default;
 
 	virtual Format get_format() const = 0;
 
@@ -86,46 +86,40 @@ public:
 	struct EntryPoint
 	{
 		std::string name;
-		Stage stage;
+		Stage stage = VERTEX;
 		std::vector<const Variable *> globals;
-
-		EntryPoint();
 	};
 
 	struct StructMember
 	{
 		std::string name;
-		DataType type;
-		const Structure *struct_type;
-		unsigned offset;
-		unsigned array_size;
-		const Constant *array_size_spec;
-		unsigned array_stride;
-		unsigned matrix_stride;
-
-		StructMember();
+		DataType type = VOID;
+		const Structure *struct_type = 0;
+		unsigned offset = 0;
+		unsigned array_size = 0;
+		const Constant *array_size_spec = 0;
+		unsigned array_stride = 0;
+		unsigned matrix_stride = 0;
 	};
 
 	struct Structure
 	{
 		std::string name;
 		std::vector<StructMember> members;
-		unsigned size;
+		unsigned size = 0;
 	};
 
 	struct Variable
 	{
 		std::string name;
-		StorageClass storage;
-		DataType type;
-		const Structure *struct_type;
-		const Constant *array_size_spec;
-		unsigned array_size;
-		int location;
-		int descriptor_set;
-		int binding;
-
-		Variable();
+		StorageClass storage = static_cast<StorageClass>(-1);
+		DataType type = VOID;
+		const Structure *struct_type = 0;
+		const Constant *array_size_spec = 0;
+		unsigned array_size = 0;
+		int location = -1;
+		int descriptor_set = -1;
+		int binding = -1;
 
 		bool operator==(const Variable &) const;
 	};
@@ -133,11 +127,11 @@ public:
 	struct Constant
 	{
 		std::string name;
-		int constant_id;
-		DataType type;
+		int constant_id = -1;
+		DataType type = VOID;
 		union
 		{
-			int i_value;
+			int i_value = 0;
 			float f_value;
 		};
 	};
@@ -145,14 +139,12 @@ public:
 private:
 	struct TypeInfo
 	{
-		DataType type;
-		const Structure *struct_type;
-		const Constant *array_size_spec;
-		unsigned array_size;
-		unsigned array_stride;
-		StorageClass storage;
-
-		TypeInfo();
+		DataType type = VOID;
+		const Structure *struct_type = 0;
+		const Constant *array_size_spec = 0;
+		unsigned array_size = 0;
+		unsigned array_stride = 0;
+		StorageClass storage = static_cast<StorageClass>(-1);
 	};
 
 	struct Reflection
@@ -198,7 +190,7 @@ private:
 	std::vector<Constant> spec_constants;
 
 public:
-	SpirVModule() { }
+	SpirVModule() = default;
 	SpirVModule(const SpirVModule &);
 	SpirVModule &operator=(const SpirVModule &);
 private:
diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 15de0b4d..23a2ed6a 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -7,21 +7,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-PipelineState::PipelineState():
-	framebuffer(0),
-	viewport(0),
-	scissor(0),
-	shprog(0),
-	vertex_setup(0),
-	front_face(COUNTERCLOCKWISE),
-	face_cull(NO_CULL),
-	enabled_clip_planes(0),
-	depth_test(0),
-	stencil_test(0),
-	blend(0),
-	changes(0)
-{ }
-
 template<typename T>
 void PipelineState::set(T &target, T value, unsigned flag)
 {
diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 42543e4d..0d0520a0 100644
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -60,25 +60,21 @@ private:
 		SCISSOR = 2048
 	};
 
-	const Framebuffer *framebuffer;
-	const Rect *viewport;
-	const Rect *scissor;
-	const Program *shprog;
-	const VertexSetup *vertex_setup;
-	FaceWinding front_face;
-	CullMode face_cull;
-	unsigned enabled_clip_planes;
+	const Framebuffer *framebuffer = 0;
+	const Rect *viewport = 0;
+	const Rect *scissor = 0;
+	const Program *shprog = 0;
+	const VertexSetup *vertex_setup = 0;
+	FaceWinding front_face = COUNTERCLOCKWISE;
+	CullMode face_cull = NO_CULL;
+	unsigned enabled_clip_planes = 0;
 	std::vector<BoundTexture> textures;
 	std::vector<BoundUniformBlock> uniform_blocks;
-	const DepthTest *depth_test;
-	const StencilTest *stencil_test;
-	const Blend *blend;
-	mutable unsigned changes;
+	const DepthTest *depth_test = 0;
+	const StencilTest *stencil_test = 0;
+	const Blend *blend = 0;
+	mutable unsigned changes = 0;
 
-public:
-	PipelineState();
-
-private:
 	template<typename T>
 	void set(T &, T, unsigned);
 public:
diff --git a/source/core/program.h b/source/core/program.h
index f41a7d6d..fd1c1ae0 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -52,7 +52,7 @@ private:
 
 public:
 	/// Constructs an empty Program with no shader stages attached.
-	Program() { }
+	Program() = default;
 
 	/// Constructs a Program from a Module, with specialization constants.
 	Program(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
diff --git a/source/core/rect.h b/source/core/rect.h
index 333dbc25..4f6bd6bd 100644
--- a/source/core/rect.h
+++ b/source/core/rect.h
@@ -6,12 +6,12 @@ namespace GL {
 
 struct Rect
 {
-	int left;
-	int bottom;
-	unsigned width;
-	unsigned height;
+	int left = 0;
+	int bottom = 0;
+	unsigned width = 0;
+	unsigned height = 0;
 
-	Rect(): left(0), bottom(0), width(0), height(0) { }
+	Rect() = default;
 	Rect(int l, int b, unsigned w, unsigned h): left(l), bottom(b), width(w), height(h) { }
 };
 
diff --git a/source/core/reflectdata.cpp b/source/core/reflectdata.cpp
index 7a141db2..db679873 100644
--- a/source/core/reflectdata.cpp
+++ b/source/core/reflectdata.cpp
@@ -17,23 +17,6 @@ void ReflectData::update_layout_hash()
 }
 
 
-ReflectData::UniformInfo::UniformInfo():
-	block(0),
-	location(-1),
-	array_size(0),
-	array_stride(0),
-	matrix_stride(0),
-	type(VOID),
-	binding(-1)
-{ }
-
-
-ReflectData::UniformBlockInfo::UniformBlockInfo():
-	data_size(0),
-	bind_point(-1),
-	layout_hash(0)
-{ }
-
 void ReflectData::UniformBlockInfo::sort_uniforms()
 {
 	sort(uniforms, [](const UniformInfo *u1, const UniformInfo *u2){ return u1->location<u2->location; });
@@ -47,12 +30,5 @@ void ReflectData::UniformBlockInfo::update_layout_hash()
 	layout_hash = hash32(layout_descriptor);
 }
 
-
-ReflectData::AttributeInfo::AttributeInfo():
-	location(-1),
-	array_size(0),
-	type(VOID)
-{ }
-
 } // namespace GL
 } // namespace Msp
diff --git a/source/core/reflectdata.h b/source/core/reflectdata.h
index 90b7ce0d..fff190a5 100644
--- a/source/core/reflectdata.h
+++ b/source/core/reflectdata.h
@@ -20,31 +20,27 @@ struct ReflectData
 	struct UniformInfo
 	{
 		std::string name;
-		const UniformBlockInfo *block;
+		const UniformBlockInfo *block = 0;
 		union
 		{
-			int location;
+			int location = -1;
 			unsigned offset;
 		};
-		unsigned array_size;
-		unsigned array_stride;
-		unsigned matrix_stride;
-		DataType type;
+		unsigned array_size = 0;
+		unsigned array_stride = 0;
+		unsigned matrix_stride = 0;
+		DataType type = VOID;
 		Tag tag;
-		int binding;
-
-		UniformInfo();
+		int binding = -1;
 	};
 
 	struct UniformBlockInfo
 	{
 		std::string name;
-		unsigned data_size;
-		int bind_point;
+		unsigned data_size = 0;
+		int bind_point = -1;
 		std::vector<const UniformInfo *> uniforms;
-		LayoutHash layout_hash;
-
-		UniformBlockInfo();
+		LayoutHash layout_hash = 0;
 
 		void sort_uniforms();
 		void update_layout_hash();
@@ -53,11 +49,9 @@ struct ReflectData
 	struct AttributeInfo
 	{
 		std::string name;
-		unsigned location;
-		unsigned array_size;
-		DataType type;
-
-		AttributeInfo();
+		unsigned location = -1;
+		unsigned array_size = 0;
+		DataType type = VOID;
 	};
 
 	std::vector<UniformBlockInfo> uniform_blocks;
diff --git a/source/core/sampler.cpp b/source/core/sampler.cpp
index 6f4770ac..6658ef9a 100644
--- a/source/core/sampler.cpp
+++ b/source/core/sampler.cpp
@@ -7,19 +7,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sampler::Sampler():
-	min_filter(NEAREST_MIPMAP_LINEAR),
-	mag_filter(LINEAR),
-	max_anisotropy(1.0f),
-	wrap_s(REPEAT),
-	wrap_t(REPEAT),
-	wrap_r(REPEAT),
-	border_color(Color(0.0f, 0.0f, 0.0f, 0.0f)),
-	compare(false),
-	cmp_func(LEQUAL),
-	dirty_params(0)
-{ }
-
 void Sampler::update() const
 {
 	SamplerBackend::update(dirty_params);
diff --git a/source/core/sampler.h b/source/core/sampler.h
index bd8db31f..c7906877 100644
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -98,21 +98,17 @@ private:
 		COMPARE = 128
 	};
 
-	TextureFilter min_filter;
-	TextureFilter mag_filter;
-	float max_anisotropy;
-	TextureWrap wrap_s;
-	TextureWrap wrap_t;
-	TextureWrap wrap_r;
-	Color border_color;
-	bool compare;
-	Predicate cmp_func;
-	mutable int dirty_params;
+	TextureFilter min_filter = NEAREST_MIPMAP_LINEAR;
+	TextureFilter mag_filter = LINEAR;
+	float max_anisotropy = 1.0f;
+	TextureWrap wrap_s = REPEAT;
+	TextureWrap wrap_t = REPEAT;
+	TextureWrap wrap_r = REPEAT;
+	Color border_color = { 0.0f, 0.0f, 0.0f, 0.0f };
+	bool compare = false;
+	Predicate cmp_func = LEQUAL;
+	mutable int dirty_params = 0;
 
-public:
-	Sampler();
-
-private:
 	void update() const;
 
 public:
diff --git a/source/core/stenciltest.cpp b/source/core/stenciltest.cpp
index 2e8bbb4d..2a1f0a84 100644
--- a/source/core/stenciltest.cpp
+++ b/source/core/stenciltest.cpp
@@ -8,16 +8,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-StencilTest::StencilTest():
-	enabled(false),
-	compare(ALWAYS),
-	stencil_fail_op(KEEP),
-	depth_fail_op(KEEP),
-	depth_pass_op(KEEP),
-	reference(0)
-{ }
-
-
 StencilTest::Loader::Loader(StencilTest &st):
 	ObjectLoader<StencilTest>(st)
 {
diff --git a/source/core/stenciltest.h b/source/core/stenciltest.h
index 652f8d40..47e7a627 100644
--- a/source/core/stenciltest.h
+++ b/source/core/stenciltest.h
@@ -37,14 +37,12 @@ struct StencilTest
 		void actions(StencilOp, StencilOp, StencilOp);
 	};
 
-	bool enabled;
-	Predicate compare;
-	StencilOp stencil_fail_op;
-	StencilOp depth_fail_op;
-	StencilOp depth_pass_op;
-	unsigned reference;
-
-	StencilTest();
+	bool enabled = false;
+	Predicate compare = ALWAYS;
+	StencilOp stencil_fail_op = KEEP;
+	StencilOp depth_fail_op = KEEP;
+	StencilOp depth_pass_op = KEEP;
+	unsigned reference = 0;
 };
 
 void operator>>(const LexicalConverter &, StencilOp &);
diff --git a/source/core/tag.h b/source/core/tag.h
index dbc0b3ef..edc33c63 100644
--- a/source/core/tag.h
+++ b/source/core/tag.h
@@ -13,9 +13,9 @@ string is guaranteed to have an id of 0.
 */
 struct Tag
 {
-	unsigned id;
+	unsigned id = 0;
 
-	Tag(): id(0) { }
+	Tag() = default;
 	Tag(const char *);
 	Tag(const std::string &s);
 
diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 1733a2d8..1015a0af 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -6,10 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture1D::Texture1D():
-	width(0)
-{ }
-
 void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 {
 	if(width>0)
diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index 1871a17c..04284697 100644
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -26,12 +26,10 @@ public:
 	};
 
 private:
-	unsigned width;
-	unsigned levels;
+	unsigned width = 0;
+	unsigned levels = 0;
 
 public:
-	Texture1D();
-
 	void storage(PixelFormat, unsigned, unsigned = 0);
 
 	void image(unsigned, const void *);
diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 01612d73..3c3579c1 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -6,11 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture2D::Texture2D():
-	width(0),
-	height(0)
-{ }
-
 Texture2D::~Texture2D()
 {
 	set_manager(0);
diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 4f0bde26..209cede5 100644
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -32,12 +32,11 @@ public:
 	};
 
 private:
-	unsigned width;
-	unsigned height;
-	unsigned levels;
+	unsigned width = 0;
+	unsigned height = 0;
+	unsigned levels = 0;
 
 public:
-	Texture2D();
 	virtual ~Texture2D();
 
 	/** Defines storage structure for the texture.  If lv is zero, the number
diff --git a/source/core/texture2dmultisample.cpp b/source/core/texture2dmultisample.cpp
index 5ea37e90..1c0106d7 100644
--- a/source/core/texture2dmultisample.cpp
+++ b/source/core/texture2dmultisample.cpp
@@ -7,11 +7,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture2DMultisample::Texture2DMultisample():
-	width(0),
-	height(0)
-{ }
-
 void Texture2DMultisample::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned sm)
 {
 	if(width>0)
diff --git a/source/core/texture2dmultisample.h b/source/core/texture2dmultisample.h
index 9710ad78..8c3275c0 100644
--- a/source/core/texture2dmultisample.h
+++ b/source/core/texture2dmultisample.h
@@ -11,13 +11,11 @@ class Texture2DMultisample: public Texture2DMultisampleBackend
 	friend Texture2DMultisampleBackend;
 
 private:
-	unsigned width;
-	unsigned height;
-	unsigned samples;
+	unsigned width = 0;
+	unsigned height = 0;
+	unsigned samples = 0;
 
 public:
-	Texture2DMultisample();
-
 	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned sm);
 
 	virtual void image(const Graphics::Image &, unsigned = 0);
diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 0fb26ccd..e48b7662 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -8,16 +8,7 @@ namespace Msp {
 namespace GL {
 
 Texture3D::Texture3D(unsigned t):
-	Texture3DBackend(t),
-	width(0),
-	height(0),
-	depth(0)
-{ }
-
-Texture3D::Texture3D():
-	width(0),
-	height(0),
-	depth(0)
+	Texture3DBackend(t)
 { }
 
 void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
diff --git a/source/core/texture3d.h b/source/core/texture3d.h
index 21893abc..4a166174 100644
--- a/source/core/texture3d.h
+++ b/source/core/texture3d.h
@@ -31,14 +31,14 @@ public:
 	};
 
 protected:
-	unsigned width;
-	unsigned height;
-	unsigned depth;
-	unsigned levels;
+	unsigned width = 0;
+	unsigned height = 0;
+	unsigned depth = 0;
+	unsigned levels = 0;
 
 	Texture3D(unsigned);
 public:
-	Texture3D();
+	Texture3D() = default;
 
 	/** Defines storage structure for the texture.  If lv is zero, the number
 	of mipmap levels is automatically determined from storage dimensions.
diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index ea294997..9aec4b1d 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -29,10 +29,6 @@ const unsigned TextureCube::orientations[12] =
 	1, 3
 };
 
-TextureCube::TextureCube():
-	size(0)
-{ }
-
 void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 {
 	if(size>0)
diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index 363ceea3..2f445919 100644
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -51,15 +51,13 @@ public:
 	};
 
 private:
-	unsigned size;
-	unsigned levels;
+	unsigned size = 0;
+	unsigned levels = 0;
 
 	static const Vector3 directions[6];
 	static const unsigned orientations[12];
 
 public:
-	TextureCube();
-
 	/** Defines storage structure for the texture.  If lv is zero, the number
 	of mipmap levels is automatically determined from storage dimensions.
 
diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index 30bc9bcc..796bef80 100644
--- a/source/core/vertexarray.cpp
+++ b/source/core/vertexarray.cpp
@@ -6,10 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexArray::VertexArray():
-	stride(0)
-{ }
-
 VertexArray::VertexArray(const VertexFormat &f)
 {
 	set_format(f);
diff --git a/source/core/vertexarray.h b/source/core/vertexarray.h
index 290fa10c..d80b2786 100644
--- a/source/core/vertexarray.h
+++ b/source/core/vertexarray.h
@@ -32,12 +32,12 @@ public:
 private:
 	VertexFormat format;
 	std::vector<char> data;
-	unsigned stride;
+	unsigned stride = 0;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
 public:
-	VertexArray();
+	VertexArray() = default;
 
 	/// Construct a VertexArray and set its format.
 	VertexArray(const VertexFormat &);
diff --git a/source/core/vertexformat.cpp b/source/core/vertexformat.cpp
index b95da9d1..ff043f7d 100644
--- a/source/core/vertexformat.cpp
+++ b/source/core/vertexformat.cpp
@@ -7,10 +7,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexFormat::VertexFormat():
-	count(0)
-{ }
-
 VertexFormat::VertexFormat(VertexAttribute a):
 	count(1)
 {
diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h
index f9f99398..4ff34017 100644
--- a/source/core/vertexformat.h
+++ b/source/core/vertexformat.h
@@ -75,11 +75,11 @@ class VertexFormat
 private:
 	enum { MAX_ATTRIBUTES = 15 };
 
-	std::uint8_t count;
+	std::uint8_t count = 0;
 	VertexAttribute attributes[MAX_ATTRIBUTES];
 
 public:
-	VertexFormat();
+	VertexFormat() = default;
 	VertexFormat(VertexAttribute);
 
 	VertexFormat operator,(VertexAttribute) const;
diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 4fd589a9..7b346d8e 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -8,14 +8,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexSetup::VertexSetup():
-	dirty(0),
-	vertex_array(0),
-	inst_array(0),
-	index_buffer(0),
-	index_type(UNSIGNED_SHORT)
-{ }
-
 void VertexSetup::set_format(const VertexFormat &vfmt)
 {
 	if(!verify_format(vfmt))
diff --git a/source/core/vertexsetup.h b/source/core/vertexsetup.h
index 7daef884..208e55d3 100644
--- a/source/core/vertexsetup.h
+++ b/source/core/vertexsetup.h
@@ -27,17 +27,15 @@ private:
 		INDEX_BUFFER = 4
 	};
 
-	mutable unsigned dirty;
-	const VertexArray *vertex_array;
+	mutable unsigned dirty = 0;
+	const VertexArray *vertex_array = 0;
 	VertexFormat vertex_format;
-	const VertexArray *inst_array;
+	const VertexArray *inst_array = 0;
 	VertexFormat inst_format;
-	const Buffer *index_buffer;
-	DataType index_type;
+	const Buffer *index_buffer = 0;
+	DataType index_type = UNSIGNED_SHORT;
 
 public:
-	VertexSetup();
-
 	void set_format(const VertexFormat &);
 	void set_format_instanced(const VertexFormat &, const VertexFormat &);
 
diff --git a/source/effects/ambientocclusion.cpp b/source/effects/ambientocclusion.cpp
index d431bcdd..8149e408 100644
--- a/source/effects/ambientocclusion.cpp
+++ b/source/effects/ambientocclusion.cpp
@@ -128,13 +128,6 @@ void AmbientOcclusion::set_debug_name(const string &name)
 }
 
 
-AmbientOcclusion::Template::Template():
-	n_samples(16),
-	occlusion_radius(0.5f),
-	darkness(1.0f),
-	edge_depth_threshold(0.1f)
-{ }
-
 AmbientOcclusion *AmbientOcclusion::Template::create(unsigned width, unsigned height) const
 {
 	RefPtr<AmbientOcclusion> ao = new AmbientOcclusion(width/size_divisor, height/size_divisor);
diff --git a/source/effects/ambientocclusion.h b/source/effects/ambientocclusion.h
index fd3b6574..efaa2f37 100644
--- a/source/effects/ambientocclusion.h
+++ b/source/effects/ambientocclusion.h
@@ -26,12 +26,10 @@ public:
 			Loader(Template &);
 		};
 
-		unsigned n_samples;
-		float occlusion_radius;
-		float darkness;
-		float edge_depth_threshold;
-
-		Template();
+		unsigned n_samples = 16;
+		float occlusion_radius = 0.5f;
+		float darkness = 1.0f;
+		float edge_depth_threshold = 0.1f;
 
 		virtual AmbientOcclusion *create(unsigned, unsigned) const;
 	};
diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index a6fefa6e..8a8dea3e 100644
--- a/source/effects/bloom.cpp
+++ b/source/effects/bloom.cpp
@@ -93,11 +93,6 @@ void Bloom::set_debug_name(const string &name)
 }
 
 
-Bloom::Template::Template():
-	radius(2.0f),
-	strength(0.2f)
-{ }
-
 Bloom *Bloom::Template::create(unsigned width, unsigned height) const
 {
 	RefPtr<Bloom> bloom = new Bloom(width/size_divisor, height/size_divisor);
diff --git a/source/effects/bloom.h b/source/effects/bloom.h
index d6c9307c..94057b2f 100644
--- a/source/effects/bloom.h
+++ b/source/effects/bloom.h
@@ -29,10 +29,8 @@ public:
 			Loader(Template &);
 		};
 
-		float radius;
-		float strength;
-
-		Template();
+		float radius = 2.0f;
+		float strength = 0.2f;
 
 		virtual Bloom *create(unsigned, unsigned) const;
 	};
diff --git a/source/effects/colorcurve.cpp b/source/effects/colorcurve.cpp
index f4a786a4..c64f8531 100644
--- a/source/effects/colorcurve.cpp
+++ b/source/effects/colorcurve.cpp
@@ -86,13 +86,6 @@ void ColorCurve::set_debug_name(const string &name)
 }
 
 
-ColorCurve::Template::Template():
-	exposure_adjust(0.0f),
-	brightness_response(0.4f),
-	gamma(1.0f),
-	srgb(false)
-{ }
-
 ColorCurve *ColorCurve::Template::create(unsigned, unsigned) const
 {
 	RefPtr<ColorCurve> colorcurve = new ColorCurve();
diff --git a/source/effects/colorcurve.h b/source/effects/colorcurve.h
index 01a7d35d..5cebcb00 100644
--- a/source/effects/colorcurve.h
+++ b/source/effects/colorcurve.h
@@ -34,12 +34,10 @@ public:
 			void srgb();
 		};
 
-		float exposure_adjust;
-		float brightness_response;
-		float gamma;
-		bool srgb;
-
-		Template();
+		float exposure_adjust = 0.0f;
+		float brightness_response = 0.4f;
+		float gamma = 1.0f;
+		bool srgb = false;
 
 		virtual ColorCurve *create(unsigned, unsigned) const;
 	};
diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 47cea090..6fb0e5c3 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -17,6 +17,7 @@ EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Rendera
 
 EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e):
 	Effect(r),
+	size(s),
 	environment(e),
 	irradiance_shprog(Resources::get_global().get<Program>("_envmap_irradiance.glsl.shader")),
 	specular_shprog(Resources::get_global().get<Program>("_envmap_specular.glsl.shader")),
@@ -27,11 +28,6 @@ EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable
 	if(!l || (1U<<(l-1))>=s)
 		throw invalid_argument("EnvironmentMap::EnvironmentMap");
 
-	size = s;
-	rendered = false;
-	update_interval = 1;
-	update_delay = 0;
-
 	env_tex.storage(f, size, l);
 	depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
 	for(unsigned i=0; i<6; ++i)
diff --git a/source/effects/environmentmap.h b/source/effects/environmentmap.h
index 2d27ee7d..f9f4cf53 100644
--- a/source/effects/environmentmap.h
+++ b/source/effects/environmentmap.h
@@ -52,9 +52,9 @@ private:
 	const Sampler &sampler;
 	const Sampler &mip_sampler;
 	ProgramData shdata;
-	bool rendered;
-	unsigned update_interval;
-	unsigned update_delay;
+	bool rendered = false;
+	unsigned update_interval = 1;
+	unsigned update_delay = 0;
 
 public:
 	EnvironmentMap(unsigned size, PixelFormat, Renderable &rend, Renderable &env);
diff --git a/source/effects/postprocessor.cpp b/source/effects/postprocessor.cpp
index e6308634..246f6ef8 100644
--- a/source/effects/postprocessor.cpp
+++ b/source/effects/postprocessor.cpp
@@ -6,11 +6,6 @@
 namespace Msp {
 namespace GL {
 
-PostProcessor::Template::Template():
-	size_divisor(1)
-{ }
-
-
 PostProcessor::Template::Loader::Loader(Template &t):
 	DataFile::ObjectLoader<Template>(t)
 {
diff --git a/source/effects/postprocessor.h b/source/effects/postprocessor.h
index ee169e79..8b2884ac 100644
--- a/source/effects/postprocessor.h
+++ b/source/effects/postprocessor.h
@@ -27,10 +27,9 @@ public:
 			Loader(Template &);
 		};
 
-		unsigned size_divisor;
+		unsigned size_divisor = 1;
 
-		Template();
-		virtual ~Template() { }
+		virtual ~Template() = default;
 
 		virtual PostProcessor *create(unsigned, unsigned) const = 0;
 	};
diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index a0627faa..36011107 100644
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -17,11 +17,7 @@ ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting *l, R
 	height(h),
 	lighting(l),
 	shadow_caster(c),
-	sampler(Resources::get_global().get<Sampler>("_linear_clamp_shadow.samp")),
-	radius(1),
-	depth_bias(4),
-	darkness(1.0f),
-	rendered(false)
+	sampler(Resources::get_global().get<Sampler>("_linear_clamp_shadow.samp"))
 {
 	depth_buf.storage(DEPTH_COMPONENT32F, width, height, 1);
 	fbo.set_format((DEPTH_ATTACHMENT,DEPTH_COMPONENT32F));
diff --git a/source/effects/shadowmap.h b/source/effects/shadowmap.h
index cb622993..611f56f5 100644
--- a/source/effects/shadowmap.h
+++ b/source/effects/shadowmap.h
@@ -41,11 +41,11 @@ private:
 	Texture2D depth_buf;
 	const Sampler &sampler;
 	Vector3 target;
-	float radius;
-	float depth_bias;
-	float darkness;
+	float radius = 1.0f;
+	float depth_bias = 4.0f;
+	float darkness = 1.0f;
 	ProgramData shdata;
-	bool rendered;
+	bool rendered = false;
 	std::string debug_name;
 
 	ShadowMap(unsigned, unsigned, Renderable &, const Lighting *, Renderable &);
diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 41734fe8..506fba1c 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -25,17 +25,11 @@ namespace GL {
 namespace SL {
 
 Compiler::Compiler():
-	features(DeviceInfo::get_global().glsl_features),
-	module(0),
-	compiled(false),
-	specialized(false)
+	features(DeviceInfo::get_global().glsl_features)
 { }
 
 Compiler::Compiler(const Features &f):
-	features(f),
-	module(0),
-	compiled(false),
-	specialized(false)
+	features(f)
 { }
 
 Compiler::~Compiler()
diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index f9e0e3fe..1c07f325 100644
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -40,10 +40,10 @@ private:
 	};
 
 	Features features;
-	Module *module;
+	Module *module = 0;
 	std::vector<std::string> imported_names;
-	bool compiled;
-	bool specialized;
+	bool compiled = false;
+	bool specialized = false;
 	std::map<std::string, int> spec_values;
 
 public:
diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index a66eefc5..943f3b06 100644
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -4,21 +4,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Features::Features():
-	target_api(OPENGL),
-	arb_enhanced_layouts(false),
-	arb_explicit_attrib_location(false),
-	arb_explicit_uniform_location(false),
-	arb_gpu_shader5(false),
-	arb_separate_shader_objects(false),
-	arb_uniform_buffer_object(false),
-	ext_gpu_shader4(false),
-	ext_texture_array(false),
-	constant_id_range(0x80000000U),
-	uniform_binding_range(84),
-	texture_binding_range(96)
-{ }
-
 Features Features::from_version(const Version &ver)
 {
 	Features features;
diff --git a/source/glsl/features.h b/source/glsl/features.h
index ca74d38a..14cc2b37 100644
--- a/source/glsl/features.h
+++ b/source/glsl/features.h
@@ -9,21 +9,19 @@ namespace SL {
 
 struct Features
 {
-	GraphicsApi target_api;
+	GraphicsApi target_api = OPENGL;
 	Version glsl_version;
-	bool arb_enhanced_layouts;
-	bool arb_explicit_attrib_location;
-	bool arb_explicit_uniform_location;
-	bool arb_gpu_shader5;
-	bool arb_separate_shader_objects;
-	bool arb_uniform_buffer_object;
-	bool ext_gpu_shader4;
-	bool ext_texture_array;
-	unsigned constant_id_range;
-	unsigned uniform_binding_range;
-	unsigned texture_binding_range;
-
-	Features();
+	bool arb_enhanced_layouts = false;
+	bool arb_explicit_attrib_location = false;
+	bool arb_explicit_uniform_location = false;
+	bool arb_gpu_shader5 = false;
+	bool arb_separate_shader_objects = false;
+	bool arb_uniform_buffer_object = false;
+	bool ext_gpu_shader4 = false;
+	bool ext_texture_array = false;
+	unsigned constant_id_range = 0x80000000U;
+	unsigned uniform_binding_range = 84;
+	unsigned texture_binding_range = 96;
 
 	static Features from_version(const Version &);
 	static Features latest();
diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index e444974a..4068037e 100644
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -12,10 +12,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-StructOrganizer::StructOrganizer():
-	offset(-1)
-{ }
-
 void StructOrganizer::visit(StructDeclaration &strct)
 {
 	SetForScope<int> set_offset(offset, 0);
@@ -238,10 +234,6 @@ void LocationAllocator::visit(InterfaceBlock &iface)
 }
 
 
-PrecisionConverter::PrecisionConverter():
-	stage(0)
-{ }
-
 void PrecisionConverter::apply(Stage &s)
 {
 	stage = &s;
@@ -308,10 +300,6 @@ void PrecisionConverter::visit(VariableDeclaration &var)
 }
 
 
-LegacyConverter::LegacyConverter():
-	frag_out(0)
-{ }
-
 void LegacyConverter::apply(Stage &s, const Features &feat)
 {
 	stage = &s;
diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index fd29737a..1fe5fa45 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -12,11 +12,9 @@ namespace SL {
 class StructOrganizer: private TraversingVisitor
 {
 private:
-	int offset;
+	int offset = -1;
 
 public:
-	StructOrganizer();
-
 	void apply(Stage &s) { s.content.visit(*this); }
 
 private:
@@ -64,14 +62,12 @@ according to the requirements of the target API. */
 class PrecisionConverter: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::set<std::string> have_default;
 	NodeList<Statement>::iterator insert_point;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	PrecisionConverter();
-
 	void apply(Stage &);
 
 private:
@@ -85,15 +81,13 @@ features. */
 class LegacyConverter: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	Features features;
-	VariableDeclaration *frag_out;
+	VariableDeclaration *frag_out = 0;
 	NodeList<Statement>::iterator uniform_insert_point;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	LegacyConverter();
-
 	virtual void apply(Stage &, const Features &);
 
 private:
diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index a17f7fb5..ec51c19c 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -44,13 +44,6 @@ void ConstantIdAssigner::visit(VariableDeclaration &var)
 }
 
 
-InterfaceGenerator::InterfaceGenerator():
-	stage(0),
-	function_scope(false),
-	copy_block(false),
-	iface_target_block(0)
-{ }
-
 string InterfaceGenerator::get_out_prefix(Stage::Type type)
 {
 	if(type==Stage::VERTEX)
diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index eb7d488a..fc58b2db 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -36,20 +36,18 @@ Unresolved variables are looked up in the previous stage's out variables. */
 class InterfaceGenerator: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::string in_prefix;
 	std::string out_prefix;
-	bool function_scope;
-	bool copy_block;
+	bool function_scope = false;
+	bool copy_block = false;
 	std::vector<VariableDeclaration *> declared_inputs;
-	Block *iface_target_block;
+	Block *iface_target_block = 0;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	InterfaceGenerator();
-
 	void apply(Stage &);
 
 private:
diff --git a/source/glsl/glsl_error.cpp b/source/glsl/glsl_error.cpp
index d7bf458c..392682db 100644
--- a/source/glsl/glsl_error.cpp
+++ b/source/glsl/glsl_error.cpp
@@ -20,14 +20,6 @@ parse_error::parse_error(const Location &loc, const string &token, const string
 { }
 
 
-Diagnostic::Diagnostic():
-	severity(INFO),
-	source(0),
-	line(0),
-	provoking_source(0),
-	provoking_line(0)
-{ }
-
 Diagnostic::Diagnostic(Severity v, int s, unsigned l, const string &m):
 	severity(v),
 	source(s),
diff --git a/source/glsl/glsl_error.h b/source/glsl/glsl_error.h
index 0b4b4b02..0a271994 100644
--- a/source/glsl/glsl_error.h
+++ b/source/glsl/glsl_error.h
@@ -54,14 +54,14 @@ struct Diagnostic
 		ERR
 	};
 
-	Severity severity;
-	int source;
-	unsigned line;
-	int provoking_source;
-	unsigned provoking_line;
+	Severity severity = INFO;
+	int source = 0;
+	unsigned line = 0;
+	int provoking_source = 0;
+	unsigned provoking_line = 0;
 	std::string message;
 
-	Diagnostic();
+	Diagnostic() = default;
 	Diagnostic(Severity, int, unsigned, const std::string &);
 };
 
diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index a24d85dd..8c586e7a 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -11,10 +11,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-ConstantSpecializer::ConstantSpecializer():
-	values(0)
-{ }
-
 void ConstantSpecializer::apply(Stage &stage, const map<string, int> &v)
 {
 	values = &v;
@@ -59,11 +55,6 @@ void ConstantSpecializer::visit(VariableDeclaration &var)
 }
 
 
-InlineableFunctionLocator::InlineableFunctionLocator():
-	current_function(0),
-	return_count(0)
-{ }
-
 void InlineableFunctionLocator::visit(FunctionCall &call)
 {
 	FunctionDeclaration *def = call.declaration;
@@ -118,11 +109,6 @@ void InlineableFunctionLocator::visit(Return &ret)
 }
 
 
-InlineContentInjector::InlineContentInjector():
-	source_func(0),
-	pass(REFERENCED)
-{ }
-
 string InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_func, Block &tgt_blk, const NodeList<Statement>::iterator &ins_pt, FunctionCall &call)
 {
 	source_func = call.declaration->definition;
@@ -257,12 +243,6 @@ void InlineContentInjector::visit(Return &ret)
 }
 
 
-FunctionInliner::FunctionInliner():
-	current_function(0),
-	r_any_inlined(false),
-	r_inlined_here(false)
-{ }
-
 bool FunctionInliner::apply(Stage &s)
 {
 	stage = &s;
@@ -348,16 +328,6 @@ void FunctionInliner::visit(Iteration &iter)
 }
 
 
-ExpressionInliner::ExpressionInliner():
-	r_ref_info(0),
-	r_trivial(false),
-	access_read(true),
-	access_write(false),
-	iteration_init(false),
-	iteration_body(0),
-	r_oper(0)
-{ }
-
 bool ExpressionInliner::apply(Stage &s)
 {
 	s.content.visit(*this);
@@ -983,10 +953,6 @@ void ConstantConditionEliminator::visit(Iteration &iter)
 }
 
 
-UnreachableCodeRemover::UnreachableCodeRemover():
-	reachable(true)
-{ }
-
 bool UnreachableCodeRemover::apply(Stage &stage)
 {
 	stage.content.visit(*this);
@@ -1080,17 +1046,6 @@ void UnusedTypeRemover::visit(FunctionDeclaration &func)
 }
 
 
-UnusedVariableRemover::UnusedVariableRemover():
-	stage(0),
-	interface_block(0),
-	r_assignment(0),
-	assignment_target(false),
-	r_side_effects(false),
-	in_struct(false),
-	composite_reference(false),
-	in_loop(0)
-{ }
-
 bool UnusedVariableRemover::apply(Stage &s)
 {
 	stage = &s;
diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 92353a77..ae55e5af 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -14,11 +14,9 @@ constants. */
 class ConstantSpecializer: private TraversingVisitor
 {
 private:
-	const std::map<std::string, int> *values;
+	const std::map<std::string, int> *values = 0;
 
 public:
-	ConstantSpecializer();
-
 	void apply(Stage &, const std::map<std::string, int> &);
 
 private:
@@ -33,12 +31,10 @@ class InlineableFunctionLocator: private TraversingVisitor
 private:
 	std::map<FunctionDeclaration *, unsigned> refcounts;
 	std::set<FunctionDeclaration *> inlineable;
-	FunctionDeclaration *current_function;
-	unsigned return_count;
+	FunctionDeclaration *current_function = 0;
+	unsigned return_count = 0;
 
 public:
-	InlineableFunctionLocator();
-
 	std::set<FunctionDeclaration *> apply(Stage &s) { s.content.visit(*this); return inlineable; }
 
 private:
@@ -62,17 +58,15 @@ private:
 		RENAME
 	};
 
-	FunctionDeclaration *source_func;
+	FunctionDeclaration *source_func = 0;
 	Block staging_block;
-	Pass pass;
+	Pass pass = REFERENCED;
 	RefPtr<Statement> r_inlined_statement;
 	std::set<Node *> dependencies;
 	std::set<std::string> referenced_names;
 	std::string r_result_name;
 
 public:
-	InlineContentInjector();
-
 	std::string apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionCall &);
 
 private:
@@ -89,17 +83,15 @@ are inlined. */
 class FunctionInliner: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::set<FunctionDeclaration *> inlineable;
-	FunctionDeclaration *current_function;
+	FunctionDeclaration *current_function = 0;
 	NodeList<Statement>::iterator insert_point;
 	RefPtr<Expression> r_inline_result;
-	bool r_any_inlined;
-	bool r_inlined_here;
+	bool r_any_inlined = false;
+	bool r_inlined_here = false;
 
 public:
-	FunctionInliner();
-
 	bool apply(Stage &);
 
 private:
@@ -118,37 +110,31 @@ class ExpressionInliner: private TraversingVisitor
 private:
 	struct ExpressionUse
 	{
-		RefPtr<Expression> *reference;
-		Block *ref_scope;
-		bool blocked;
-
-		ExpressionUse(): reference(0), ref_scope(0), blocked(false) { }
+		RefPtr<Expression> *reference = 0;
+		Block *ref_scope = 0;
+		bool blocked = false;
 	};
 
 	struct ExpressionInfo
 	{
 		Assignment::Target target;
 		RefPtr<Expression> expression;
-		Block *assign_scope;
+		Block *assign_scope = 0;
 		std::vector<ExpressionUse> uses;
-		bool trivial;
-
-		ExpressionInfo(): expression(0), assign_scope(0), trivial(false) { }
+		bool trivial = false;
 	};
 
 	std::list<ExpressionInfo> expressions;
 	std::map<Assignment::Target, ExpressionInfo *> assignments;
-	ExpressionInfo *r_ref_info;
-	bool r_trivial;
-	bool access_read;
-	bool access_write;
-	bool iteration_init;
-	Block *iteration_body;
-	const Operator *r_oper;
+	ExpressionInfo *r_ref_info = 0;
+	bool r_trivial = false;
+	bool access_read = true;
+	bool access_write = false;
+	bool iteration_init = false;
+	Block *iteration_body = 0;
+	const Operator *r_oper = 0;
 
 public:
-	ExpressionInliner();
-
 	bool apply(Stage &);
 
 private:
@@ -170,14 +156,14 @@ evaluating the expression.*/
 class ConstantFolder: private TraversingVisitor
 {
 private:
-	VariableDeclaration *iteration_var;
+	VariableDeclaration *iteration_var = 0;
 	Variant iter_init_value;
 	Variant r_constant_value;
-	bool iteration_init;
-	bool r_constant;
-	bool r_literal;
-	bool r_uses_iter_var;
-	bool r_any_folded;
+	bool iteration_init = false;
+	bool r_constant = false;
+	bool r_literal = false;
+	bool r_uses_iter_var = false;
+	bool r_any_folded = false;
 
 public:
 	bool apply(Stage &s) { s.content.visit(*this); return r_any_folded; }
@@ -225,7 +211,7 @@ private:
 	NodeList<Statement>::iterator insert_point;
 	std::set<Node *> nodes_to_remove;
 	RefPtr<Expression> r_ternary_result;
-	bool r_external_side_effects;
+	bool r_external_side_effects = false;
 
 public:
 	void apply(Stage &);
@@ -246,12 +232,10 @@ private:
 class UnreachableCodeRemover: private TraversingVisitor
 {
 private:
-	bool reachable;
+	bool reachable = true;
 	std::set<Node *> unreachable_nodes;
 
 public:
-	UnreachableCodeRemover();
-
 	virtual bool apply(Stage &);
 
 private:
@@ -289,44 +273,38 @@ class UnusedVariableRemover: private TraversingVisitor
 private:
 	struct AssignmentInfo
 	{
-		Node *node;
+		Node *node = 0;
 		Assignment::Target target;
 		std::vector<Node *> used_by;
-		unsigned in_loop;
-
-		AssignmentInfo(): node(0) { }
+		unsigned in_loop = 0;
 	};
 
 	struct VariableInfo
 	{
-		InterfaceBlock *interface_block;
+		InterfaceBlock *interface_block = 0;
 		std::vector<AssignmentInfo *> assignments;
-		bool initialized;
-		bool output;
-		bool referenced;
-
-		VariableInfo(): interface_block(0), initialized(false), output(false), referenced(false) { }
+		bool initialized = false;
+		bool output = false;
+		bool referenced = false;
 	};
 
 	typedef std::map<Statement *, VariableInfo> BlockVariableMap;
 
-	Stage *stage;
+	Stage *stage = 0;
 	BlockVariableMap variables;
 	std::list<AssignmentInfo> assignments;
-	InterfaceBlock *interface_block;
-	Assignment *r_assignment;
-	bool assignment_target;
-	bool r_side_effects;
-	bool in_struct;
-	bool composite_reference;
-	unsigned in_loop;
+	InterfaceBlock *interface_block = 0;
+	Assignment *r_assignment = 0;
+	bool assignment_target = false;
+	bool r_side_effects = false;
+	bool in_struct = false;
+	bool composite_reference = false;
+	unsigned in_loop = 0;
 	std::vector<Node *> loop_ext_refs;
 	Assignment::Target r_reference;
 	std::set<Node *> unused_nodes;
 
 public:
-	UnusedVariableRemover();
-
 	bool apply(Stage &);
 
 private:
diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 0a4af2d4..c2c54f9f 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -8,16 +8,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Formatter::Formatter():
-	stage(0),
-	source_index(0),
-	source_line(1),
-	indent(0),
-	parameter_list(false),
-	omit_builtin(false),
-	r_empty_name(false)
-{ }
-
 string Formatter::apply(Stage &s)
 {
 	stage = &s;
diff --git a/source/glsl/output.h b/source/glsl/output.h
index 09cdf071..dbdd888e 100644
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -13,18 +13,16 @@ namespace SL {
 class Formatter: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::string formatted;
-	unsigned source_index;
-	unsigned source_line;
-	unsigned indent;
-	bool parameter_list;
-	bool omit_builtin;
-	bool r_empty_name;
+	unsigned source_index = 0;
+	unsigned source_line = 1;
+	unsigned indent = 0;
+	bool parameter_list = false;
+	bool omit_builtin = false;
+	bool r_empty_name = false;
 
 public:
-	Formatter();
-
 	std::string apply(Stage &);
 
 private:
diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 83af09a6..258244e8 100644
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -49,13 +49,6 @@ bool can_convert(const BasicTypeDeclaration &from, const BasicTypeDeclaration &t
 
 unsigned TypeComparer::next_tag = 1;
 
-TypeComparer::TypeComparer():
-	first(0),
-	second(0),
-	first_tag(0),
-	r_result(false)
-{ }
-
 void TypeComparer::compare(Node &node1, Node &node2)
 {
 	if(&node1==&node2)
@@ -234,10 +227,6 @@ void TypeComparer::visit(VariableDeclaration &var)
 }
 
 
-LocationCounter::LocationCounter():
-	r_count(0)
-{ }
-
 void LocationCounter::visit(BasicTypeDeclaration &basic)
 {
 	r_count = basic.kind==BasicTypeDeclaration::MATRIX ? basic.size>>16 : 1;
diff --git a/source/glsl/reflect.h b/source/glsl/reflect.h
index 6c00bca8..d48fbec1 100644
--- a/source/glsl/reflect.h
+++ b/source/glsl/reflect.h
@@ -16,16 +16,14 @@ bool can_convert(const BasicTypeDeclaration &, const BasicTypeDeclaration &);
 class TypeComparer: private NodeVisitor
 {
 private:
-	Node *first;
-	Node *second;
-	unsigned first_tag;
-	bool r_result;
+	Node *first = 0;
+	Node *second = 0;
+	unsigned first_tag = 0;
+	bool r_result = false;
 
 	static unsigned next_tag;
 
 public:
-	TypeComparer();
-
 	bool apply(TypeDeclaration &t1, TypeDeclaration &t2) { compare(t1, t2); return r_result; }
 
 private:
@@ -47,11 +45,9 @@ private:
 class LocationCounter: private NodeVisitor
 {
 private:
-	unsigned r_count;
+	unsigned r_count = 0;
 
 public:
-	LocationCounter();
-
 	unsigned apply(VariableDeclaration &v) { v.visit(*this); return r_count; }
 
 private:
@@ -74,9 +70,9 @@ public:
 		Result(unsigned s, unsigned a): size(s), alignment(a), stride(s+a-1-(s+a-1)%a) { }
 	};
 private:
-	unsigned r_size;
-	unsigned r_alignment;
-	int r_offset;
+	unsigned r_size = 0;
+	unsigned r_alignment = 1;
+	int r_offset = -1;
 
 public:
 	Result apply(VariableDeclaration &v) { v.visit(*this); return Result(r_size, r_alignment); }
diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp
index 96ca4921..c62f19e5 100644
--- a/source/glsl/resolve.cpp
+++ b/source/glsl/resolve.cpp
@@ -17,12 +17,6 @@ void BlockHierarchyResolver::enter(Block &block)
 }
 
 
-TypeResolver::TypeResolver():
-	stage(0),
-	iface_block(0),
-	r_any_resolved(false)
-{ }
-
 bool TypeResolver::apply(Stage &s)
 {
 	stage = &s;
@@ -151,13 +145,6 @@ void TypeResolver::visit(FunctionDeclaration &func)
 }
 
 
-VariableResolver::VariableResolver():
-	stage(0),
-	r_any_resolved(false),
-	record_target(false),
-	r_self_referencing(false)
-{ }
-
 bool VariableResolver::apply(Stage &s)
 {
 	stage = &s;
@@ -444,11 +431,6 @@ void VariableResolver::visit(InterfaceBlock &iface)
 }
 
 
-ExpressionResolver::ExpressionResolver():
-	stage(0),
-	r_any_resolved(false)
-{ }
-
 bool ExpressionResolver::apply(Stage &s)
 {
 	stage = &s;
diff --git a/source/glsl/resolve.h b/source/glsl/resolve.h
index 633ff11d..f32d0cd5 100644
--- a/source/glsl/resolve.h
+++ b/source/glsl/resolve.h
@@ -15,11 +15,9 @@ namespace SL {
 class BlockHierarchyResolver: private TraversingVisitor
 {
 private:
-	bool r_any_resolved;
+	bool r_any_resolved = false;
 
 public:
-	BlockHierarchyResolver(): r_any_resolved(false) { }
-
 	bool apply(Stage &s) { r_any_resolved = false; s.content.visit(*this); return r_any_resolved; }
 
 private:
@@ -30,16 +28,14 @@ private:
 class TypeResolver: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
 	std::map<TypeDeclaration *, TypeDeclaration *> array_types;
 	NodeList<Statement>::iterator type_insert_point;
-	InterfaceBlock *iface_block;
-	bool r_any_resolved;
+	InterfaceBlock *iface_block = 0;
+	bool r_any_resolved = false;
 
 public:
-	TypeResolver();
-
 	bool apply(Stage &);
 
 private:
@@ -59,18 +55,16 @@ of an interface block are turned into interface block references. */
 class VariableResolver: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	RefPtr<Expression> r_replacement_expr;
-	bool r_any_resolved;
-	bool record_target;
-	bool r_self_referencing;
+	bool r_any_resolved = false;
+	bool record_target = false;
+	bool r_self_referencing = false;
 	Assignment::Target r_assignment_target;
 	std::vector<VariableDeclaration *> redeclared_builtins;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	VariableResolver();
-
 	bool apply(Stage &);
 
 private:
@@ -102,20 +96,16 @@ private:
 
 	struct ArgumentInfo
 	{
-		BasicTypeDeclaration *type;
-		unsigned component_count;
-
-		ArgumentInfo(): type(0), component_count(0) { }
+		BasicTypeDeclaration *type = 0;
+		unsigned component_count = 0;
 	};
 
-	Stage *stage;
+	Stage *stage = 0;
 	std::vector<BasicTypeDeclaration *> basic_types;
 	NodeList<Statement>::iterator insert_point;
-	bool r_any_resolved;
+	bool r_any_resolved = false;
 
 public:
-	ExpressionResolver();
-
 	bool apply(Stage &);
 
 private:
@@ -148,9 +138,9 @@ private:
 class FunctionResolver: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
-	bool r_any_resolved;
+	bool r_any_resolved = false;
 
 public:
 	bool apply(Stage &);
diff --git a/source/glsl/sourcemap.cpp b/source/glsl/sourcemap.cpp
index b81931e1..6c4dd476 100644
--- a/source/glsl/sourcemap.cpp
+++ b/source/glsl/sourcemap.cpp
@@ -9,10 +9,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-SourceMap::SourceMap():
-	base_index(0)
-{ }
-
 void SourceMap::set_name(unsigned i, const string &n)
 {
 	if(source_names.empty())
diff --git a/source/glsl/sourcemap.h b/source/glsl/sourcemap.h
index da1f9b76..5622d289 100644
--- a/source/glsl/sourcemap.h
+++ b/source/glsl/sourcemap.h
@@ -11,12 +11,10 @@ namespace SL {
 class SourceMap
 {
 private:
-	unsigned base_index;
+	unsigned base_index = 0;
 	std::vector<std::string> source_names;
 
 public:
-	SourceMap();
-
 	void set_name(unsigned, const std::string &);
 	unsigned get_count() const { return base_index+source_names.size(); }
 	const std::string &get_name(unsigned) const;
diff --git a/source/glsl/spirv.cpp b/source/glsl/spirv.cpp
index 1da748a6..233d1548 100644
--- a/source/glsl/spirv.cpp
+++ b/source/glsl/spirv.cpp
@@ -132,20 +132,7 @@ const SpirVGenerator::BuiltinFunctionInfo SpirVGenerator::builtin_functions[] =
 };
 
 SpirVGenerator::SpirVGenerator():
-	stage(0),
-	current_function(0),
-	writer(content),
-	next_id(1),
-	r_expression_result_id(0),
-	constant_expression(false),
-	spec_constant(false),
-	reachable(false),
-	composite_access(false),
-	r_composite_base_id(0),
-	r_composite_base(0),
-	assignment_source_id(0),
-	loop_merge_block_id(0),
-	loop_continue_target_id(0)
+	writer(content)
 { }
 
 void SpirVGenerator::apply(Module &module)
diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h
index 669342f3..6971e2a9 100644
--- a/source/glsl/spirv.h
+++ b/source/glsl/spirv.h
@@ -70,8 +70,8 @@ private:
 		bool operator<(const ConstantKey &) const;
 	};
 
-	Stage *stage;
-	FunctionDeclaration *current_function;
+	Stage *stage = 0;
+	FunctionDeclaration *current_function = 0;
 	std::vector<const InterfaceLayout *> interface_layouts;
 	SpirVContent content;
 	SpirVWriter writer;
@@ -86,19 +86,19 @@ private:
 	std::map<std::string, Id> function_type_ids;
 	std::map<ConstantKey, Id> constant_ids;
 	std::map<const VariableDeclaration *, Id> variable_load_ids;
-	Id next_id;
-	Id r_expression_result_id;
-	bool r_constant_result;
-	bool constant_expression;
-	bool spec_constant;
-	bool reachable;
-	bool composite_access;
-	Id r_composite_base_id;
-	Node *r_composite_base;
+	Id next_id = 1;
+	Id r_expression_result_id = 0;
+	bool r_constant_result = false;
+	bool constant_expression = false;
+	bool spec_constant = false;
+	bool reachable = false;
+	bool composite_access = false;
+	Id r_composite_base_id = 0;
+	Node *r_composite_base = 0;
 	std::vector<unsigned> r_composite_chain;
-	Id assignment_source_id;
-	Id loop_merge_block_id;
-	Id loop_continue_target_id;
+	Id assignment_source_id = 0;
+	Id loop_merge_block_id = 0;
+	Id loop_continue_target_id = 0;
 
 	static const BuiltinFunctionInfo builtin_functions[];
 
diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index bb8d7dab..dff52639 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -75,11 +75,6 @@ NodeContainer<C>::NodeContainer(const NodeContainer &c):
 }
 
 
-Block::Block():
-	use_braces(false),
-	parent(0)
-{ }
-
 Block::Block(const Block &other):
 	Node(other),
 	body(other.body),
@@ -93,27 +88,15 @@ void Block::visit(NodeVisitor &visitor)
 }
 
 
-Expression::Expression():
-	oper(0),
-	type(0),
-	lvalue(false)
-{ }
-
-
 void Literal::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
 }
 
 
-VariableReference::VariableReference():
-	declaration(0)
-{ }
-
 VariableReference::VariableReference(const VariableReference &other):
 	Expression(other),
-	name(other.name),
-	declaration(0)
+	name(other.name)
 { }
 
 void VariableReference::visit(NodeVisitor &visitor)
@@ -122,14 +105,9 @@ void VariableReference::visit(NodeVisitor &visitor)
 }
 
 
-InterfaceBlockReference::InterfaceBlockReference():
-	declaration(0)
-{ }
-
 InterfaceBlockReference::InterfaceBlockReference(const InterfaceBlockReference &other):
 	Expression(other),
-	name(other.name),
-	declaration(0)
+	name(other.name)
 { }
 
 void InterfaceBlockReference::visit(NodeVisitor &visitor)
@@ -138,17 +116,11 @@ void InterfaceBlockReference::visit(NodeVisitor &visitor)
 }
 
 
-MemberAccess::MemberAccess():
-	declaration(0),
-	index(-1)
-{ }
-
 MemberAccess::MemberAccess(const MemberAccess &other):
 	Expression(other),
 	left(other.left),
-	member(other.member),
-	declaration(0),
-	index(-1)
+	member(other.member)
+	// Do not copy declaration
 { }
 
 void MemberAccess::visit(NodeVisitor &visitor)
@@ -157,12 +129,6 @@ void MemberAccess::visit(NodeVisitor &visitor)
 }
 
 
-Swizzle::Swizzle():
-	count(0)
-{
-	fill(components, components+4, 0);
-}
-
 void Swizzle::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -181,13 +147,10 @@ void BinaryExpression::visit(NodeVisitor &visitor)
 }
 
 
-Assignment::Assignment():
-	self_referencing(false)
-{ }
-
 Assignment::Assignment(const Assignment &other):
 	BinaryExpression(other),
 	self_referencing(other.self_referencing)
+	// Do not copy target
 { }
 
 void Assignment::visit(NodeVisitor &visitor)
@@ -196,13 +159,6 @@ void Assignment::visit(NodeVisitor &visitor)
 }
 
 
-Assignment::Target::Target(Statement *d):
-	declaration(d),
-	chain_len(0)
-{
-	fill(chain, chain+7, 0);
-}
-
 bool Assignment::Target::operator<(const Target &other) const
 {
 	if(declaration!=other.declaration)
@@ -220,17 +176,12 @@ void TernaryExpression::visit(NodeVisitor &visitor)
 }
 
 
-FunctionCall::FunctionCall():
-	constructor(false),
-	declaration(0)
-{ }
-
 FunctionCall::FunctionCall(const FunctionCall &other):
 	Expression(other),
 	name(other.name),
 	constructor(other.constructor),
-	arguments(other.arguments),
-	declaration(0)
+	arguments(other.arguments)
+	// Do not copy declaration
 { }
 
 void FunctionCall::visit(NodeVisitor &visitor)
@@ -269,20 +220,13 @@ void InterfaceLayout::visit(NodeVisitor &visitor)
 }
 
 
-BasicTypeDeclaration::BasicTypeDeclaration():
-	kind(ALIAS),
-	size(0),
-	sign(true),
-	base_type(0)
-{ }
-
 BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other):
 	TypeDeclaration(other),
 	kind(other.kind),
 	size(other.size),
 	sign(other.sign),
-	base(other.base),
-	base_type(0)
+	base(other.base)
+	// Do not copy base type
 { }
 
 void BasicTypeDeclaration::visit(NodeVisitor &visitor)
@@ -291,29 +235,21 @@ void BasicTypeDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-ImageTypeDeclaration::ImageTypeDeclaration():
-	dimensions(TWO),
-	array(false),
-	sampled(true),
-	shadow(false)
-{ }
-
 void ImageTypeDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
 }
 
 
-StructDeclaration::StructDeclaration():
-	interface_block(0)
+StructDeclaration::StructDeclaration()
 {
 	members.use_braces = true;
 }
 
 StructDeclaration::StructDeclaration(const StructDeclaration &other):
 	TypeDeclaration(other),
-	members(other.members),
-	interface_block(0)
+	members(other.members)
+	// Do not copy interface block
 { }
 
 StructDeclaration::~StructDeclaration()
@@ -328,13 +264,6 @@ void StructDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-VariableDeclaration::VariableDeclaration():
-	constant(false),
-	array(false),
-	type_declaration(0),
-	linked_declaration(0)
-{ }
-
 VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
 	Statement(other),
 	layout(other.layout),
@@ -347,9 +276,8 @@ VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
 	name(other.name),
 	array(other.array),
 	array_size(other.array_size),
-	init_expression(other.init_expression),
-	type_declaration(0),
-	linked_declaration(0)
+	init_expression(other.init_expression)
+	// Do not copy type and linked declarations
 { }
 
 VariableDeclaration::~VariableDeclaration()
@@ -364,23 +292,14 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-InterfaceBlock::InterfaceBlock():
-	array(false),
-	type_declaration(0),
-	struct_declaration(0),
-	linked_block(0)
-{ }
-
 InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
 	Statement(other),
 	interface(other.interface),
 	block_name(other.block_name),
 	members(other.members),
 	instance_name(other.instance_name),
-	array(other.array),
-	type_declaration(0),
-	struct_declaration(0),
-	linked_block(0)
+	array(other.array)
+	// Do not copy pointers to other nodes
 { }
 
 InterfaceBlock::~InterfaceBlock()
@@ -397,13 +316,6 @@ void InterfaceBlock::visit(NodeVisitor &visitor)
 }
 
 
-FunctionDeclaration::FunctionDeclaration():
-	virtua(false),
-	overrd(false),
-	definition(0),
-	return_type_declaration(0)
-{ }
-
 FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	Statement(other),
 	return_type(other.return_type),
@@ -413,8 +325,8 @@ FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	overrd(other.overrd),
 	body(other.body),
 	signature(other.signature),
-	definition(other.definition==&other ? this : 0),
-	return_type_declaration(0)
+	definition(other.definition==&other ? this : 0)
+	// Do not copy return type declaration
 { }
 
 void FunctionDeclaration::visit(NodeVisitor &visitor)
diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 7fa116b7..a3b217d4 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -60,15 +60,15 @@ struct NodeVisitor;
 
 struct Node
 {
-	int source;
-	unsigned line;
+	int source = GENERATED_SOURCE;
+	unsigned line = 1;
 
-	Node(): source(GENERATED_SOURCE), line(1) { }
-	Node(const Node &n): source(n.source), line(n.line) { }
+	Node() = default;
+	Node(const Node &) = default;
 private:
 	Node &operator=(const Node &);
 public:
-	virtual ~Node() { }
+	virtual ~Node() = default;
 
 	virtual Node *clone() const = 0;
 	virtual void visit(NodeVisitor &) = 0;
@@ -78,10 +78,10 @@ template<typename T>
 class NodePtr: public RefPtr<T>
 {
 public:
-	NodePtr() { }
+	NodePtr() = default;
 	NodePtr(T *p): RefPtr<T>(p) { }
 	NodePtr(const NodePtr &p): RefPtr<T>(p ? p->clone() : 0) { }
-	NodePtr &operator=(const NodePtr &p) { RefPtr<T>::operator=(p); return *this; }
+	NodePtr &operator=(const NodePtr &p) = default;
 
 	template<typename U>
 	NodePtr(const RefPtr<U> &p): RefPtr<T>(p) { }
@@ -94,7 +94,7 @@ template<typename C>
 class NodeContainer: public C
 {
 public:
-	NodeContainer() { }
+	NodeContainer() = default;
 	NodeContainer(const NodeContainer &);
 
 	void push_back_nocopy(const typename C::value_type &v)
@@ -122,12 +122,12 @@ struct Statement: Node
 struct Block: Node
 {
 	NodeList<Statement> body;
-	bool use_braces;
+	bool use_braces = false;
 
 	std::map<std::string, VariableDeclaration *> variables;
-	Block *parent;
+	Block *parent = 0;
 
-	Block();
+	Block() = default;
 	Block(const Block &);
 
 	virtual Block *clone() const { return new Block(*this); }
@@ -136,12 +136,10 @@ struct Block: Node
 
 struct Expression: Node
 {
-	const Operator *oper;
+	const Operator *oper = 0;
 
-	TypeDeclaration *type;
-	bool lvalue;
-
-	Expression();
+	TypeDeclaration *type = 0;
+	bool lvalue = false;
 
 	virtual Expression *clone() const = 0;
 };
@@ -159,9 +157,9 @@ struct VariableReference: Expression
 {
 	std::string name;
 
-	VariableDeclaration *declaration;
+	VariableDeclaration *declaration = 0;
 
-	VariableReference();
+	VariableReference() = default;
 	VariableReference(const VariableReference &);
 
 	virtual VariableReference *clone() const { return new VariableReference(*this); }
@@ -172,9 +170,9 @@ struct InterfaceBlockReference: Expression
 {
 	std::string name;
 
-	InterfaceBlock *declaration;
+	InterfaceBlock *declaration = 0;
 
-	InterfaceBlockReference();
+	InterfaceBlockReference() = default;
 	InterfaceBlockReference(const InterfaceBlockReference &);
 
 	virtual InterfaceBlockReference *clone() const { return new InterfaceBlockReference(*this); }
@@ -186,10 +184,10 @@ struct MemberAccess: Expression
 	NodePtr<Expression> left;
 	std::string member;
 
-	VariableDeclaration *declaration;
-	int index;
+	VariableDeclaration *declaration = 0;
+	int index = -1;
 
-	MemberAccess();
+	MemberAccess() = default;
 	MemberAccess(const MemberAccess &);
 
 	virtual MemberAccess *clone() const { return new MemberAccess(*this); }
@@ -200,10 +198,8 @@ struct Swizzle: Expression
 {
 	NodePtr<Expression> left;
 	std::string component_group;
-	unsigned count;
-	std::uint8_t components[4];
-
-	Swizzle();
+	unsigned count = 0;
+	std::uint8_t components[4] = { 0, 0, 0, 0 };
 
 	virtual Swizzle *clone() const { return new Swizzle(*this); }
 	virtual void visit(NodeVisitor &);
@@ -237,20 +233,20 @@ struct Assignment: BinaryExpression
 			ARRAY = 0xC0
 		};
 
-		Statement *declaration;
-		std::uint8_t chain_len;
-		std::uint8_t chain[7];
+		Statement *declaration = 0;
+		std::uint8_t chain_len = 0;
+		std::uint8_t chain[7] = { };
 
-		Target(Statement * = 0);
+		Target(Statement *d = 0): declaration(d) { }
 
 		bool operator<(const Target &) const;
 	};
 
-	bool self_referencing;
+	bool self_referencing = false;
 
 	Target target;
 
-	Assignment();
+	Assignment() = default;
 	Assignment(const Assignment &);
 
 	virtual Assignment *clone() const { return new Assignment(*this); }
@@ -270,12 +266,12 @@ struct TernaryExpression: Expression
 struct FunctionCall: Expression
 {
 	std::string name;
-	bool constructor;
+	bool constructor = false;
 	NodeArray<Expression> arguments;
 
-	FunctionDeclaration *declaration;
+	FunctionDeclaration *declaration = 0;
 
-	FunctionCall();
+	FunctionCall() = default;
 	FunctionCall(const FunctionCall &);
 
 	virtual FunctionCall *clone() const { return new FunctionCall(*this); }
@@ -355,14 +351,14 @@ struct BasicTypeDeclaration: TypeDeclaration
 		ARRAY
 	};
 
-	Kind kind;
-	unsigned size;
-	bool sign;
+	Kind kind = ALIAS;
+	unsigned size = 0;
+	bool sign = true;
 	std::string base;
 
-	TypeDeclaration *base_type;
+	TypeDeclaration *base_type = 0;
 
-	BasicTypeDeclaration();
+	BasicTypeDeclaration() = default;
 	BasicTypeDeclaration(const BasicTypeDeclaration &);
 
 	virtual BasicTypeDeclaration *clone() const { return new BasicTypeDeclaration(*this); }
@@ -379,15 +375,13 @@ struct ImageTypeDeclaration: TypeDeclaration
 		CUBE
 	};
 
-	Dimensions dimensions;
-	bool array;
-	bool sampled;
-	bool shadow;
+	Dimensions dimensions = TWO;
+	bool array = false;
+	bool sampled = true;
+	bool shadow = false;
 	std::string base;
 
-	TypeDeclaration *base_type;
-
-	ImageTypeDeclaration();
+	TypeDeclaration *base_type = 0;
 
 	virtual ImageTypeDeclaration *clone() const { return new ImageTypeDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -397,7 +391,7 @@ struct StructDeclaration: TypeDeclaration
 {
 	Block members;
 
-	InterfaceBlock *interface_block;
+	InterfaceBlock *interface_block = 0;
 
 	StructDeclaration();
 	StructDeclaration(const StructDeclaration &);
@@ -410,21 +404,21 @@ struct StructDeclaration: TypeDeclaration
 struct VariableDeclaration: Statement
 {
 	NodePtr<Layout> layout;
-	bool constant;
+	bool constant = false;
 	std::string sampling;
 	std::string interpolation;
 	std::string interface;
 	std::string precision;
 	std::string type;
 	std::string name;
-	bool array;
+	bool array = false;
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
 
-	TypeDeclaration *type_declaration;
-	VariableDeclaration *linked_declaration;
+	TypeDeclaration *type_declaration = 0;
+	VariableDeclaration *linked_declaration = 0;
 
-	VariableDeclaration();
+	VariableDeclaration() = default;
 	VariableDeclaration(const VariableDeclaration &);
 	~VariableDeclaration();
 
@@ -439,15 +433,15 @@ struct InterfaceBlock: Statement
 	std::string block_name;
 	NodePtr<Block> members;
 	std::string instance_name;
-	bool array;
+	bool array = false;
 
 	/* An interface block's ultimate base type is always a struct.  The
 	immediate type may be either that same struct or an array of it. */
-	TypeDeclaration *type_declaration;
-	StructDeclaration *struct_declaration;
-	InterfaceBlock *linked_block;
+	TypeDeclaration *type_declaration = 0;
+	StructDeclaration *struct_declaration = 0;
+	InterfaceBlock *linked_block = 0;
 
-	InterfaceBlock();
+	InterfaceBlock() = default;
 	InterfaceBlock(const InterfaceBlock &);
 	~InterfaceBlock();
 
@@ -460,15 +454,15 @@ struct FunctionDeclaration: Statement
 	std::string return_type;
 	std::string name;
 	NodeArray<VariableDeclaration> parameters;
-	bool virtua;
-	bool overrd;
+	bool virtua = false;
+	bool overrd = false;
 	Block body;
 
 	std::string signature;
-	FunctionDeclaration *definition;
-	TypeDeclaration *return_type_declaration;
+	FunctionDeclaration *definition = 0;
+	TypeDeclaration *return_type_declaration = 0;
 
-	FunctionDeclaration();
+	FunctionDeclaration() = default;
 	FunctionDeclaration(const FunctionDeclaration &);
 
 	virtual FunctionDeclaration *clone() const { return new FunctionDeclaration(*this); }
diff --git a/source/glsl/tokenizer.cpp b/source/glsl/tokenizer.cpp
index 595a97ab..4064d805 100644
--- a/source/glsl/tokenizer.cpp
+++ b/source/glsl/tokenizer.cpp
@@ -10,9 +10,7 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Tokenizer::Tokenizer():
-	allow_preprocess(true),
-	suppress_line_advance(false)
+Tokenizer::Tokenizer()
 {
 	static string empty;
 	iter = empty.begin();
diff --git a/source/glsl/tokenizer.h b/source/glsl/tokenizer.h
index 46aa62fb..26c4b93c 100644
--- a/source/glsl/tokenizer.h
+++ b/source/glsl/tokenizer.h
@@ -14,9 +14,9 @@ class Preprocessor;
 struct Location
 {
 	std::string name;
-	unsigned line;
+	unsigned line = 0;
 
-	Location(): line(0) { }
+	Location() = default;
 	Location(const std::string &n, unsigned l): name(n), line(l) { }
 };
 
@@ -29,9 +29,9 @@ private:
 	std::string::const_iterator iter;
 	std::string::const_iterator source_end;
 	Location location;
-	bool progress_mark;
-	bool allow_preprocess;
-	bool suppress_line_advance;
+	bool progress_mark = false;
+	bool allow_preprocess = true;
+	bool suppress_line_advance = false;
 	std::string last_token;
 	std::deque<std::string> next_tokens;
 
diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index ce30c2ab..0c4b98cb 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -12,11 +12,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Validator::Validator():
-	stage(0),
-	last_provoker(0)
-{ }
-
 void Validator::diagnose(Node &node, Node &provoking_node, Diagnostic::Severity severity, const string &message)
 {
 	Diagnostic diag;
@@ -39,13 +34,6 @@ void Validator::add_info(Node &node, const string &message)
 }
 
 
-DeclarationValidator::DeclarationValidator():
-	scope(GLOBAL),
-	iface_layout(0),
-	iface_block(0),
-	variable(0)
-{ }
-
 const char *DeclarationValidator::describe_variable(ScopeType scope)
 {
 	switch(scope)
@@ -305,10 +293,6 @@ void DeclarationValidator::visit(FunctionDeclaration &func)
 }
 
 
-IdentifierValidator::IdentifierValidator():
-	anonymous_block(false)
-{ }
-
 void IdentifierValidator::multiple_definition(const string &name, Statement &statement, Statement &previous)
 {
 	error(statement, format("Multiple definition of %s", name));
@@ -506,11 +490,6 @@ void ReferenceValidator::visit(FunctionDeclaration &func)
 }
 
 
-ExpressionValidator::ExpressionValidator():
-	current_function(0),
-	constant_expression(false)
-{ }
-
 void ExpressionValidator::visit(VariableReference &var)
 {
 	if(var.declaration && constant_expression && !var.declaration->constant)
@@ -698,10 +677,6 @@ void ExpressionValidator::visit(Return &ret)
 }
 
 
-FlowControlValidator::FlowControlValidator():
-	reachable(true)
-{ }
-
 void FlowControlValidator::visit(Block &block)
 {
 	for(const RefPtr<Statement> &s: block.body)
diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index d3884901..52ae136b 100644
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -15,10 +15,10 @@ messages. */
 class Validator: protected TraversingVisitor
 {
 protected:
-	Stage *stage;
-	Node *last_provoker;
+	Stage *stage = 0;
+	Node *last_provoker = 0;
 
-	Validator();
+	Validator() = default;
 
 	void diagnose(Node &, Node &, Diagnostic::Severity, const std::string &);
 	void diagnose(Node &n, Diagnostic::Severity s, const std::string &m) { diagnose(n, n, s, m); }
@@ -39,14 +39,12 @@ private:
 		FUNCTION
 	};
 
-	ScopeType scope;
-	InterfaceLayout *iface_layout;
-	InterfaceBlock *iface_block;
-	VariableDeclaration *variable;
+	ScopeType scope = GLOBAL;
+	InterfaceLayout *iface_layout = 0;
+	InterfaceBlock *iface_block = 0;
+	VariableDeclaration *variable = 0;
 
 public:
-	DeclarationValidator();
-
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -72,11 +70,9 @@ private:
 	std::map<Block *, BlockDeclarationMap> declarations;
 	std::map<std::string, InterfaceBlock *> interface_blocks;
 	std::map<std::string, FunctionDeclaration *> overloaded_functions;
-	bool anonymous_block;
+	bool anonymous_block = false;
 
 public:
-	IdentifierValidator();
-
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -117,12 +113,10 @@ is indicated by a null result type. */
 class ExpressionValidator: private Validator
 {
 private:
-	FunctionDeclaration *current_function;
-	bool constant_expression;
+	FunctionDeclaration *current_function = 0;
+	bool constant_expression = false;
 
 public:
-	ExpressionValidator();
-
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -145,11 +139,9 @@ return statements.  Warnings are given about dead code. */
 class FlowControlValidator: private Validator
 {
 private:
-	bool reachable;
+	bool reachable = true;
 
 public:
-	FlowControlValidator();
-
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -186,15 +178,13 @@ class GlobalInterfaceValidator: private Validator
 private:
 	struct Uniform
 	{
-		Node *node;
-		TypeDeclaration *type;
+		Node *node = 0;
+		TypeDeclaration *type = 0;
 		std::string name;
-		int location;
-		unsigned loc_count;
-		int desc_set;
-		int bind_point;
-
-		Uniform(): node(0), type(0), location(-1), loc_count(1), desc_set(0), bind_point(-1) { }
+		int location = -1;
+		unsigned loc_count = 1;
+		int desc_set = 0;
+		int bind_point = -1;
 	};
 
 	std::list<Uniform> uniforms;
diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index 5e56d919..b0025982 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -136,12 +136,6 @@ void TraversingVisitor::visit(Return &ret)
 }
 
 
-NodeRemover::NodeRemover():
-	stage(0),
-	to_remove(0),
-	recursive_remove(false)
-{ }
-
 void NodeRemover::apply(Stage &s, const set<Node *> &tr)
 {
 	stage = &s;
@@ -220,11 +214,6 @@ void NodeRemover::visit(Iteration &iter)
 }
 
 
-NodeReorderer::NodeReorderer():
-	reorder_before(0),
-	to_reorder(0)
-{ }
-
 void NodeReorderer::apply(Stage &stage, Node &before, const set<Node *> &tr)
 {
 	reorder_before = &before;
diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index ed2534cb..622a4834 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -13,9 +13,9 @@ namespace SL {
 class NodeVisitor
 {
 protected:
-	NodeVisitor() { }
+	NodeVisitor() = default;
 public:
-	virtual ~NodeVisitor() { }
+	virtual ~NodeVisitor() = default;
 
 	virtual void visit(Block &) { }
 	virtual void visit(Literal &) { }
@@ -50,9 +50,9 @@ public:
 class TraversingVisitor: public NodeVisitor
 {
 protected:
-	Block *current_block;
+	Block *current_block = 0;
 
-	TraversingVisitor(): current_block(0) { }
+	TraversingVisitor() = default;
 
 public:
 	virtual void enter(Block &) { }
@@ -81,13 +81,11 @@ public:
 class NodeRemover: private TraversingVisitor
 {
 private:
-	Stage *stage;
-	const std::set<Node *> *to_remove;
-	bool recursive_remove;
+	Stage *stage = 0;
+	const std::set<Node *> *to_remove = 0;
+	bool recursive_remove = false;
 
 public:
-	NodeRemover();
-
 	void apply(Stage &, const std::set<Node *> &);
 
 private:
@@ -110,12 +108,10 @@ on the same hierarchly level as the target node are reordered. */
 class NodeReorderer: private TraversingVisitor
 {
 private:
-	Node *reorder_before;
-	const std::set<Node *> *to_reorder;
+	Node *reorder_before = 0;
+	const std::set<Node *> *to_reorder = 0;
 
 public:
-	NodeReorderer();
-
 	void apply(Stage &, Node &, const std::set<Node *> &);
 
 private:
diff --git a/source/materials/directionallight.cpp b/source/materials/directionallight.cpp
index a306196a..0afc160b 100644
--- a/source/materials/directionallight.cpp
+++ b/source/materials/directionallight.cpp
@@ -6,11 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-DirectionalLight::DirectionalLight():
-	transmittance(1.0f),
-	direction(0.0f, 0.0f, -1.0f)
-{ }
-
 void DirectionalLight::update_matrix()
 {
 	Vector3 up_dir;
diff --git a/source/materials/directionallight.h b/source/materials/directionallight.h
index 8bde91cb..cdd8b4b8 100644
--- a/source/materials/directionallight.h
+++ b/source/materials/directionallight.h
@@ -28,13 +28,9 @@ public:
 	};
 
 private:
-	Color transmittance;
-	Vector3 direction;
+	Color transmittance = { 1.0f };
+	Vector3 direction = { 0.0f, 0.0f, -1.0f };
 
-public:
-	DirectionalLight();
-
-private:
 	void update_matrix();
 
 public:
diff --git a/source/materials/light.cpp b/source/materials/light.cpp
index 24bd8fa9..9a4c09b6 100644
--- a/source/materials/light.cpp
+++ b/source/materials/light.cpp
@@ -9,11 +9,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Light::Light():
-	color(1.0f),
-	generation(0)
-{ }
-
 void Light::set_color(const Color &c)
 {
 	color = c;
diff --git a/source/materials/light.h b/source/materials/light.h
index c0f929cf..b20ebae4 100644
--- a/source/materials/light.h
+++ b/source/materials/light.h
@@ -48,12 +48,12 @@ public:
 	};
 
 protected:
-	Color color;
-	unsigned generation;
+	Color color = { 1.0f };
+	unsigned generation = 0;
 
-	Light();
+	Light() = default;
 public:
-	virtual ~Light() { }
+	virtual ~Light() = default;
 
 	/** Sets the color of the Light. */
 	void set_color(const Color &);
diff --git a/source/materials/material.h b/source/materials/material.h
index 77e7d44e..98baaa54 100644
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -68,12 +68,12 @@ public:
 	};
 
 protected:
-	const Sampler *sampler;
+	const Sampler *sampler = 0;
 	ProgramData shdata;
 
-	Material(): sampler(0) { }
+	Material() = default;
 public:
-	virtual ~Material() { }
+	virtual ~Material() = default;
 
 	virtual const Program *create_compatible_shader(const std::map<std::string, int> & = std::map<std::string, int>()) const;
 protected:
diff --git a/source/materials/pointlight.cpp b/source/materials/pointlight.cpp
index 4bbf4135..9a726a2a 100644
--- a/source/materials/pointlight.cpp
+++ b/source/materials/pointlight.cpp
@@ -6,11 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-PointLight::PointLight():
-	position(0.0f, 0.0f, 0.0f),
-	attenuation{1.0f, 0.0f, 0.1f}
-{ }
-
 void PointLight::update_matrix()
 {
 	matrix = Matrix::translation(position);
diff --git a/source/materials/pointlight.h b/source/materials/pointlight.h
index 074c8c37..1c373504 100644
--- a/source/materials/pointlight.h
+++ b/source/materials/pointlight.h
@@ -30,13 +30,9 @@ public:
 	};
 
 private:
-	Vector3 position;
-	float attenuation[3];
+	Vector3 position = { 0.0f, 0.0f, 0.0f };
+	float attenuation[3] = { 1.0f, 0.0f, 0.1f };
 
-public:
-	PointLight();
-
-private:
 	void update_matrix();
 
 public:
diff --git a/source/materials/rendermethod.cpp b/source/materials/rendermethod.cpp
index 05319758..c5ad35d5 100644
--- a/source/materials/rendermethod.cpp
+++ b/source/materials/rendermethod.cpp
@@ -14,16 +14,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-RenderMethod::RenderMethod():
-	shprog(0),
-	shprog_from_material(false),
-	shdata(0),
-	material(0),
-	face_cull(CULL_BACK),
-	receive_shadows(false),
-	image_based_lighting(false)
-{ }
-
 void RenderMethod::set_material_textures()
 {
 	const Tag *material_texture_tags = material->get_texture_tags();
diff --git a/source/materials/rendermethod.h b/source/materials/rendermethod.h
index bf35aac5..723aa5a2 100644
--- a/source/materials/rendermethod.h
+++ b/source/materials/rendermethod.h
@@ -72,21 +72,17 @@ private:
 		TextureSlot(Tag t): tag(t), texture(0), sampler(0) { }
 	};
 
-	const Program *shprog;
-	bool shprog_from_material;
+	const Program *shprog = 0;
+	bool shprog_from_material = false;
 	RefPtr<ProgramData> shdata;
 	std::map<Tag, Tag> uniform_slots;
-	const Material *material;
+	const Material *material = 0;
 	std::string material_slot;
 	std::vector<TextureSlot> textures;
-	CullMode face_cull;
-	bool receive_shadows;
-	bool image_based_lighting;
+	CullMode face_cull = CULL_BACK;
+	bool receive_shadows = false;
+	bool image_based_lighting = false;
 
-public:
-	RenderMethod();
-
-private:
 	void maybe_create_material_shader();
 	void set_material_textures();
 
diff --git a/source/materials/unlitmaterial.cpp b/source/materials/unlitmaterial.cpp
index d5d99c01..e1979051 100644
--- a/source/materials/unlitmaterial.cpp
+++ b/source/materials/unlitmaterial.cpp
@@ -11,9 +11,7 @@ const Tag UnlitMaterial::texture_tags[] =
 	Tag()
 };
 
-UnlitMaterial::UnlitMaterial():
-	texture(0),
-	vertex_color(false)
+UnlitMaterial::UnlitMaterial()
 {
 	set_color(Color(1.0f));
 }
diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h
index 4481d5f9..11641fa1 100644
--- a/source/materials/unlitmaterial.h
+++ b/source/materials/unlitmaterial.h
@@ -24,9 +24,9 @@ public:
 	};
 
 private:
-	const Texture *texture;
+	const Texture *texture = 0;
 	Color color;
-	bool vertex_color;
+	bool vertex_color = false;
 
 	static const Tag texture_tags[];
 
diff --git a/source/render/camera.cpp b/source/render/camera.cpp
index 8b966464..8f681a74 100644
--- a/source/render/camera.cpp
+++ b/source/render/camera.cpp
@@ -7,17 +7,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Camera::Camera():
-	fov(Geometry::Angle<float>::from_turns(0.125)),
-	height(0),
-	aspect(4.0/3.0),
-	clip_near(0.1),
-	clip_far(10),
-	frustum_x(0),
-	frustum_y(0),
-	position(0, 0, 0),
-	look_dir(0, 0, -1),
-	up_dir(0, 1, 0)
+Camera::Camera()
 {
 	update_projection_matrix();
 	update_object_matrix();
diff --git a/source/render/camera.h b/source/render/camera.h
index 844ec0d8..0dd59929 100644
--- a/source/render/camera.h
+++ b/source/render/camera.h
@@ -28,18 +28,18 @@ public:
 	};
 
 private:
-	Geometry::Angle<float> fov;
-	float height;
-	float aspect;
+	Geometry::Angle<float> fov = Geometry::Angle<float>::from_turns(0.125f);
+	float height = 0.0f;
+	float aspect = 4.0f/3.0f;
 	// Some compilers have "near" and "far" keywords
-	float clip_near;
-	float clip_far;
-	float frustum_x;
-	float frustum_y;
+	float clip_near = 0.1f;
+	float clip_far = 10.0f;
+	float frustum_x = 0.0f;
+	float frustum_y = 0.0f;
 	Geometry::Angle<float> rotate;
-	Vector3 position;
-	Vector3 look_dir;
-	Vector3 up_dir;
+	Vector3 position = { 0.0f, 0.0f, 0.0f };
+	Vector3 look_dir = { 0.0f, 0.0f, -1.0f };
+	Vector3 up_dir = { 0.0f, 1.0f, 0.0f };
 	Matrix view_matrix;
 	Matrix proj_matrix;
 	ProgramData shdata;
diff --git a/source/render/object.cpp b/source/render/object.cpp
index ccc7b97e..9a9f759c 100644
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -17,13 +17,11 @@ namespace GL {
 const Matrix Object::identity_matrix;
 
 Object::Object():
-	lods(1),
-	lod0_watched(false)
+	lods(1)
 { }
 
 Object::Object(const Mesh *m, const Technique *t):
-	lods(1),
-	lod0_watched(false)
+	Object()
 {
 	set_mesh(m);
 	set_technique(t);
diff --git a/source/render/object.h b/source/render/object.h
index 80a73cba..b6bd3a69 100644
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -67,7 +67,7 @@ private:
 
 	std::vector<LevelOfDetail> lods;
 	Geometry::BoundingSphere<float, 3> bounding_sphere;
-	bool lod0_watched;
+	bool lod0_watched = false;
 
 	static const Matrix identity_matrix;
 
diff --git a/source/render/occludedscene.cpp b/source/render/occludedscene.cpp
index 81af42b3..fd6ea5de 100644
--- a/source/render/occludedscene.cpp
+++ b/source/render/occludedscene.cpp
@@ -14,10 +14,7 @@ namespace GL {
 OccludedScene::OccludedScene():
 	bounding_mesh(Resources::get_global().get<Mesh>("_occluder.mesh")),
 	bounding_shader(Resources::get_global().get<Program>("_occluder.glsl.shader")),
-	no_depth_write(LEQUAL, false),
-	occluder_min_size(0.25f),
-	queries(OCCLUSION_QUERY, 0),
-	cache_dirty(false)
+	queries(OCCLUSION_QUERY, 0)
 {
 	no_color_write.write_mask = WRITE_NONE;
 }
@@ -151,13 +148,5 @@ void OccludedScene::render(Renderer &renderer, Tag tag) const
 			renderer.render(*i->renderable, tag);
 }
 
-
-OccludedScene::OccludedRenderable::OccludedRenderable():
-	renderable(0),
-	bounding_sphere(0),
-	in_frustum(false),
-	occluder(false)
-{ }
-
 } // namespace GL
 } // namespace Msp
diff --git a/source/render/occludedscene.h b/source/render/occludedscene.h
index d51b29b3..6efb354e 100644
--- a/source/render/occludedscene.h
+++ b/source/render/occludedscene.h
@@ -26,23 +26,21 @@ public:
 private:
 	struct OccludedRenderable
 	{
-		Renderable *renderable;
-		const Geometry::BoundingSphere<float, 3> *bounding_sphere;
-		bool in_frustum;
-		bool occluder;
-
-		OccludedRenderable();
+		Renderable *renderable = 0;
+		const Geometry::BoundingSphere<float, 3> *bounding_sphere = 0;
+		bool in_frustum = false;
+		bool occluder = false;
 	};
 
 	const Mesh &bounding_mesh;
 	const Program &bounding_shader;
 	Blend no_color_write;
-	DepthTest no_depth_write;
+	DepthTest no_depth_write = { LEQUAL, false };
 	std::set<Renderable *> renderables;
-	float occluder_min_size;
+	float occluder_min_size = 0.25f;
 	mutable QueryPool queries;
 	mutable std::vector<OccludedRenderable> occluded_cache;
-	mutable bool cache_dirty;
+	mutable bool cache_dirty = false;
 
 public:
 	OccludedScene();
diff --git a/source/render/placeable.h b/source/render/placeable.h
index 35999a06..6cb37235 100644
--- a/source/render/placeable.h
+++ b/source/render/placeable.h
@@ -15,9 +15,9 @@ class Placeable
 protected:
 	Matrix matrix;
 
-	Placeable() { }
+	Placeable() = default;
 public:
-	virtual ~Placeable() { }
+	virtual ~Placeable() = default;
 
 	virtual void set_matrix(const Matrix &);
 
@@ -30,7 +30,7 @@ public:
 class PlacedRenderable: public Renderable, public Placeable
 {
 protected:
-	PlacedRenderable() { }
+	PlacedRenderable() = default;
 
 public:
 	/* Reimplement to clear ambiguity between Renderable and Placeable.  This
diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 1dcac641..43bcbf3f 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -654,14 +654,6 @@ void ProgramData::set_debug_name(const string &name)
 }
 
 
-ProgramData::TaggedUniform::TaggedUniform():
-	type(VOID),
-	array_size(0),
-	data_offset(0),
-	data_size(0)
-{ }
-
-
 ProgramData::SharedBlock::SharedBlock(ReflectData::LayoutHash h):
 	block_hash(h),
 	used(0),
diff --git a/source/render/programdata.h b/source/render/programdata.h
index e5c3e4f5..2eef750c 100644
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -101,12 +101,10 @@ private:
 	struct TaggedUniform
 	{
 		Tag tag;
-		DataType type;
-		unsigned array_size;
-		unsigned data_offset;
-		unsigned data_size;
-
-		TaggedUniform();
+		DataType type = VOID;
+		unsigned array_size = 0;
+		unsigned data_offset = 0;
+		unsigned data_size = 0;
 	};
 
 	struct SharedBlock
diff --git a/source/render/renderable.h b/source/render/renderable.h
index aa895eed..a8da6430 100644
--- a/source/render/renderable.h
+++ b/source/render/renderable.h
@@ -27,9 +27,9 @@ will occur before a setup_frame call or after a finish_frame call.
 class Renderable
 {
 protected:
-	Renderable() { }
+	Renderable() = default;
 public:
-	virtual ~Renderable() { }
+	virtual ~Renderable() = default;
 
 	/** Returns the model matrix of the Renderable.  Null is returned if no such
 	matrix exists.  The matrix should be in world space for some effects to work
diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index a515071d..ad5f87d5 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -359,36 +359,8 @@ void Renderer::apply_state()
 }
 
 
-Renderer::BoundTexture::BoundTexture():
-	unit(-1),
-	texture(0),
-	sampler(0),
-	replaced(-1)
-{ }
-
-
 Renderer::BoundProgramData::BoundProgramData(const ProgramData *d):
-	shdata(d),
-	generation(0)
-{ }
-
-
-Renderer::State::State():
-	camera(0),
-	framebuffer(0),
-	viewport(0),
-	scissor(0),
-	texture_count(0),
-	clipping(0),
-	shprog(0),
-	shdata_count(0),
-	vertex_setup(0),
-	front_face(NON_MANIFOLD),
-	face_cull(NO_CULL),
-	depth_test(0),
-	stencil_test(0),
-	blend(0),
-	object_lod_bias(0)
+	shdata(d)
 { }
 
 } // namespace GL
diff --git a/source/render/renderer.h b/source/render/renderer.h
index af9eac04..fa7de736 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -69,42 +69,38 @@ private:
 	struct BoundTexture
 	{
 		Tag tag;
-		mutable int unit;
-		const Texture *texture;
-		const Sampler *sampler;
-		int replaced;
-
-		BoundTexture();
+		mutable int unit = -1;
+		const Texture *texture = 0;
+		const Sampler *sampler = 0;
+		int replaced = -1;
 	};
 
 	struct BoundProgramData
 	{
 		const ProgramData *shdata;
-		mutable unsigned generation;
+		mutable unsigned generation = 0;
 
 		BoundProgramData(const ProgramData *);
 	};
 
 	struct State
 	{
-		const Camera *camera;
+		const Camera *camera = 0;
 		Matrix model_matrix;
-		const Framebuffer *framebuffer;
-		const Rect *viewport;
-		const Rect *scissor;
-		unsigned texture_count;
-		const Clipping *clipping;
-		const Program *shprog;
-		unsigned shdata_count;
-		const VertexSetup *vertex_setup;
-		FaceWinding front_face;
-		CullMode face_cull;
-		const DepthTest *depth_test;
-		const StencilTest *stencil_test;
-		const Blend *blend;
-		unsigned object_lod_bias;
-
-		State();
+		const Framebuffer *framebuffer = 0;
+		const Rect *viewport = 0;
+		const Rect *scissor = 0;
+		unsigned texture_count = 0;
+		const Clipping *clipping = 0;
+		const Program *shprog = 0;
+		unsigned shdata_count = 0;
+		const VertexSetup *vertex_setup = 0;
+		FaceWinding front_face = NON_MANIFOLD;
+		CullMode face_cull = NO_CULL;
+		const DepthTest *depth_test = 0;
+		const StencilTest *stencil_test = 0;
+		const Blend *blend = 0;
+		unsigned object_lod_bias = 0;
 	};
 
 	enum ChangeMask
diff --git a/source/render/scene.h b/source/render/scene.h
index e55de1a8..80832393 100644
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -54,12 +54,12 @@ protected:
 	mutable Matrix culling_matrix;
 	mutable Vector4 frustum_edges[6];
 
-	Scene() { }
+	Scene() = default;
 private:
 	Scene(const Scene &);
 	Scene &operator=(const Scene &);
 public:
-	virtual ~Scene() { }
+	virtual ~Scene() = default;
 
 	virtual void add(Renderable &) = 0;
 	virtual void remove(Renderable &) = 0;
diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index e0c333de..f2a88a51 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -12,24 +12,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sequence::Sequence():
-	width(0),
-	height(0),
-	target{0, 0},
-	target_ms(0),
-	clear_enabled(false),
-	clear_depth(1.0f),
-	clear_stencil(0)
-{ }
-
 Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
 	width(w),
 	height(h),
-	target_format(f),
-	target_ms(0),
-	clear_enabled(false),
-	clear_depth(1.0f),
-	clear_stencil(0)
+	target_format(f)
 {
 	if(target_format.empty())
 		throw invalid_argument("Sequence::Sequence");
diff --git a/source/render/sequence.h b/source/render/sequence.h
index ebdb55dd..cc4b6963 100644
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -73,18 +73,18 @@ private:
 
 	std::vector<Step> steps;
 	std::vector<PostProcStep> postproc;
-	unsigned width;
-	unsigned height;
+	unsigned width = 0;
+	unsigned height = 0;
 	FrameFormat target_format;
-	RenderTarget *target[2];
-	RenderTarget *target_ms;
-	bool clear_enabled;
+	RenderTarget *target[2] = { 0, 0 };
+	RenderTarget *target_ms = 0;
+	bool clear_enabled = false;
 	std::vector<Color> clear_colors;
-	float clear_depth;
-	int clear_stencil;
+	float clear_depth = 1.0f;
+	int clear_stencil = 0;
 
 public:
-	Sequence();
+	Sequence() = default;
 	Sequence(unsigned, unsigned, const FrameFormat &);
 	~Sequence();
 
diff --git a/source/render/slot.cpp b/source/render/slot.cpp
index 6e811bde..7b77f45e 100644
--- a/source/render/slot.cpp
+++ b/source/render/slot.cpp
@@ -4,10 +4,6 @@
 namespace Msp {
 namespace GL {
 
-Slot::Slot():
-	renderable(0)
-{ }
-
 void Slot::set(Renderable *r)
 {
 	renderable = r;
diff --git a/source/render/slot.h b/source/render/slot.h
index 9129869e..40dfd758 100644
--- a/source/render/slot.h
+++ b/source/render/slot.h
@@ -13,11 +13,9 @@ needs to be switched without affecting the rest.
 class Slot: public Renderable
 {
 private:
-	Renderable *renderable;
+	Renderable *renderable = 0;
 
 public:
-	Slot();
-
 	void set(Renderable *);
 	Renderable *get() const { return renderable; }
 
diff --git a/source/render/text.cpp b/source/render/text.cpp
index cb7f998e..a51d2cf1 100644
--- a/source/render/text.cpp
+++ b/source/render/text.cpp
@@ -13,10 +13,7 @@ namespace GL {
 Text::Text(const Font &f, const Technique *tech, Tag tex_slot):
 	ObjectInstance(object),
 	font(f),
-	mesh((TEXCOORD2, VERTEX2)),
-	horz_align(0.0f),
-	vert_offset(0.0f),
-	width(0.0f)
+	mesh((TEXCOORD2, VERTEX2))
 {
 	object.set_mesh(&mesh);
 	if(tech)
diff --git a/source/render/text.h b/source/render/text.h
index 0b4fa92c..c007c81f 100644
--- a/source/render/text.h
+++ b/source/render/text.h
@@ -37,9 +37,9 @@ private:
 	Mesh mesh;
 	Object object;
 	Tag texture_slot;
-	float horz_align;
-	float vert_offset;
-	float width;
+	float horz_align = 0.0f;
+	float vert_offset = 0.0f;
+	float width = 0.0f;
 
 public:
 	Text(const Font &, const Technique * = 0, Tag = Tag());
diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp
index 7b64fb2b..b9833dad 100644
--- a/source/render/zsortedscene.cpp
+++ b/source/render/zsortedscene.cpp
@@ -7,11 +7,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ZSortedScene::ZSortedScene():
-	order(BACK_TO_FRONT),
-	reference(FURTHEST)
-{ }
-
 void ZSortedScene::add(Renderable &r)
 {
 	if(renderables.insert(&r).second && !sorted_cache.empty())
diff --git a/source/render/zsortedscene.h b/source/render/zsortedscene.h
index 9653567c..68065472 100644
--- a/source/render/zsortedscene.h
+++ b/source/render/zsortedscene.h
@@ -43,13 +43,11 @@ private:
 	};
 
 	std::set<Renderable *> renderables;
-	SortOrder order;
-	DepthReference reference;
+	SortOrder order = BACK_TO_FRONT;
+	DepthReference reference = FURTHEST;
 	mutable std::vector<SortedRenderable> sorted_cache;
 
 public:
-	ZSortedScene();
-
 	virtual void add(Renderable &);
 	virtual void remove(Renderable &);
 
diff --git a/source/resources/resource.cpp b/source/resources/resource.cpp
index 4be6ee26..644c55bb 100644
--- a/source/resources/resource.cpp
+++ b/source/resources/resource.cpp
@@ -4,10 +4,6 @@
 namespace Msp {
 namespace GL {
 
-Resource::Resource():
-	manager(0)
-{ }
-
 Resource::~Resource()
 {
 	if(manager)
diff --git a/source/resources/resource.h b/source/resources/resource.h
index 4efc0821..1fdbb3ef 100644
--- a/source/resources/resource.h
+++ b/source/resources/resource.h
@@ -25,10 +25,10 @@ public:
 	};
 
 protected:
-	ResourceManager *manager;
-	void *manager_data;
+	ResourceManager *manager = 0;
+	void *manager_data = 0;
 
-	Resource();
+	Resource() = default;
 public:
 	virtual ~Resource();
 
diff --git a/source/resources/resourcemanager.cpp b/source/resources/resourcemanager.cpp
index 5358183f..f25e6ad1 100644
--- a/source/resources/resourcemanager.cpp
+++ b/source/resources/resourcemanager.cpp
@@ -21,17 +21,6 @@ resource_load_error::resource_load_error(const string &name, const exception &ex
 { }
 
 
-ResourceManager::ResourceManager():
-	policy(LOAD_ON_DEMAND),
-	async_loads(true),
-	total_data_size(0),
-	size_limit(0),
-	frame(0),
-	min_retain_frames(30),
-	max_retain_frames(0),
-	next_unload(0)
-{ }
-
 ResourceManager::~ResourceManager()
 {
 	thread.terminate();
diff --git a/source/resources/resourcemanager.h b/source/resources/resourcemanager.h
index 2b9aef58..bd87de89 100644
--- a/source/resources/resourcemanager.h
+++ b/source/resources/resourcemanager.h
@@ -112,21 +112,20 @@ private:
 		void terminate();
 	};
 
-	LoadingPolicy policy;
-	bool async_loads;
+	LoadingPolicy policy = LOAD_ON_DEMAND;
+	bool async_loads = true;
 	mutable Mutex map_mutex;
 	std::map<const Resource *, ManagedResource> resources;
 	std::deque<ManagedResource *> queue;
-	std::uint64_t total_data_size;
-	std::uint64_t size_limit;
-	unsigned frame;
-	unsigned min_retain_frames;
-	unsigned max_retain_frames;
-	unsigned next_unload;
+	std::uint64_t total_data_size = 0;
+	std::uint64_t size_limit = 0;
+	unsigned frame = 0;
+	unsigned min_retain_frames = 30;
+	unsigned max_retain_frames = 0;
+	unsigned next_unload = 0;
 	LoadingThread thread;
 
 public:
-	ResourceManager();
 	~ResourceManager();
 
 	void set_loading_policy(LoadingPolicy);
diff --git a/source/resources/resourceobserver.h b/source/resources/resourceobserver.h
index d1313d32..ab971c1b 100644
--- a/source/resources/resourceobserver.h
+++ b/source/resources/resourceobserver.h
@@ -9,9 +9,9 @@ class Resource;
 class ResourceObserver
 {
 protected:
-	ResourceObserver() { }
+	ResourceObserver() = default;
 public:
-	virtual ~ResourceObserver() { }
+	virtual ~ResourceObserver() = default;
 
 	virtual void resource_loaded(Resource &) { }
 	virtual void resource_unloaded(Resource &) { }