diff --git a/gnoemoe/parser/ast.c b/gnoemoe/parser/ast.c
index ecd5537..bdc9623 100644
--- a/gnoemoe/parser/ast.c
+++ b/gnoemoe/parser/ast.c
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include "ast.h"
-#include "config.h"
+#include "pconfig.h"
 #include "list.h"
 #include "structures.h"
 #include "sym_table.h"
diff --git a/gnoemoe/parser/functions.c b/gnoemoe/parser/functions.c
index e87f910..d0f589d 100644
--- a/gnoemoe/parser/functions.c
+++ b/gnoemoe/parser/functions.c
@@ -17,7 +17,7 @@
 
 #include <stdarg.h>
 
-#include "config.h"
+#include "pconfig.h"
 #include "functions.h"
 #include "list.h"
 #include "storage.h"
diff --git a/gnoemoe/parser/gm-parser.c b/gnoemoe/parser/gm-parser.c
index 38aad56..615f184 100644
--- a/gnoemoe/parser/gm-parser.c
+++ b/gnoemoe/parser/gm-parser.c
@@ -1,6 +1,6 @@
 #include "parsen.h"
 #include "gm-parser.h"
-#include "../gm-debug.h"
+#include "gm-debug.h"
 
 typedef struct _ParserState {
 	GList *code;
diff --git a/gnoemoe/parser/list.c b/gnoemoe/parser/list.c
index b5d05bf..b649298 100644
--- a/gnoemoe/parser/list.c
+++ b/gnoemoe/parser/list.c
@@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "config.h"
+#include "pconfig.h"
 #include "functions.h"
 #include "list.h"
 #include "streams.h"
diff --git a/gnoemoe/parser/numbers.c b/gnoemoe/parser/numbers.c
index 260eee0..17962b2 100644
--- a/gnoemoe/parser/numbers.c
+++ b/gnoemoe/parser/numbers.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "config.h"
+#include "pconfig.h"
 #include "functions.h"
 #include "storage.h"
 #include "structures.h"
diff --git a/gnoemoe/parser/storage.c b/gnoemoe/parser/storage.c
index 6db3a04..fa7268e 100644
--- a/gnoemoe/parser/storage.c
+++ b/gnoemoe/parser/storage.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
+#include "pconfig.h"
 #include "list.h"
 #include "storage.h"
 #include "structures.h"
diff --git a/gnoemoe/parser/streams.c b/gnoemoe/parser/streams.c
index 1ac3760..5c2346a 100644
--- a/gnoemoe/parser/streams.c
+++ b/gnoemoe/parser/streams.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "config.h"
+#include "pconfig.h"
 #include "storage.h"
 #include "streams.h"
 
diff --git a/gnoemoe/parser/structures.h b/gnoemoe/parser/structures.h
index 3600bac..4de3d15 100644
--- a/gnoemoe/parser/structures.h
+++ b/gnoemoe/parser/structures.h
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <float.h>
 
-#include "config.h"
+#include "pconfig.h"
 
 typedef int32 Objid;
 typedef unsigned char Byte;
diff --git a/gnoemoe/parser/sym_table.c b/gnoemoe/parser/sym_table.c
index c958645..086c8d7 100644
--- a/gnoemoe/parser/sym_table.c
+++ b/gnoemoe/parser/sym_table.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 
 #include "ast.h"
-#include "config.h"
+#include "pconfig.h"
 #include "storage.h"
 #include "structures.h"
 #include "sym_table.h"
diff --git a/gnoemoe/parser/utils.c b/gnoemoe/parser/utils.c
index b8abe2d..968f6b7 100644
--- a/gnoemoe/parser/utils.c
+++ b/gnoemoe/parser/utils.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
+#include "pconfig.h"
 #include "numbers.h"
 #include "list.h"
 #include "storage.h"
diff --git a/gnoemoe/parser/version.c b/gnoemoe/parser/version.c
index dcb6b74..b15d7bd 100644
--- a/gnoemoe/parser/version.c
+++ b/gnoemoe/parser/version.c
@@ -37,7 +37,7 @@
  *
  */
 
-#include "config.h"
+#include "pconfig.h"
 #include "version.h"
 
 const char *server_version = "1.8.1fc+ipv6+fup1.8";