diff --git a/.gitignore b/.gitignore
index 5ae09b517..b680e25df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-core/tags
-gateway
-core/maxscale
-core/maxkeys
-core/maxpasswd
+server/core/tags
+server/core/maxscale
+server/core/maxkeys
+server/core/maxpasswd
diff --git a/log_manager/.gitignore b/log_manager/.gitignore
new file mode 100644
index 000000000..d5a8be98b
--- /dev/null
+++ b/log_manager/.gitignore
@@ -0,0 +1,5 @@
+*.o
+*.so
+*.so.*
+depend.mk
+
diff --git a/query_classifier/.gitignore b/query_classifier/.gitignore
new file mode 100644
index 000000000..d5a8be98b
--- /dev/null
+++ b/query_classifier/.gitignore
@@ -0,0 +1,5 @@
+*.o
+*.so
+*.so.*
+depend.mk
+
diff --git a/server/core/.gitignore b/server/core/.gitignore
new file mode 100644
index 000000000..84590451f
--- /dev/null
+++ b/server/core/.gitignore
@@ -0,0 +1,3 @@
+*.o
+maxscale
+depend.mk
diff --git a/server/include/.gitignore b/server/include/.gitignore
new file mode 100644
index 000000000..67020331b
--- /dev/null
+++ b/server/include/.gitignore
@@ -0,0 +1 @@
+version.h
diff --git a/server/inih/.gitignore b/server/inih/.gitignore
new file mode 100644
index 000000000..2a5429025
--- /dev/null
+++ b/server/inih/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.a
+make.depend
diff --git a/server/modules/monitor/.gitignore b/server/modules/monitor/.gitignore
new file mode 100644
index 000000000..1f1cd4c04
--- /dev/null
+++ b/server/modules/monitor/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.so
+depend.mk
diff --git a/server/modules/protocol/.gitignore b/server/modules/protocol/.gitignore
new file mode 100644
index 000000000..1f1cd4c04
--- /dev/null
+++ b/server/modules/protocol/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.so
+depend.mk
diff --git a/server/modules/routing/.gitignore b/server/modules/routing/.gitignore
new file mode 100644
index 000000000..1f1cd4c04
--- /dev/null
+++ b/server/modules/routing/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.so
+depend.mk
diff --git a/server/modules/routing/readwritesplit/.gitignore b/server/modules/routing/readwritesplit/.gitignore
new file mode 100644
index 000000000..1f1cd4c04
--- /dev/null
+++ b/server/modules/routing/readwritesplit/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.so
+depend.mk
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 000000000..5761abcfd
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1 @@
+*.o