diff --git a/GNUmakef.def b/GNUmakef.def
index 4b2352a..1315ca9 100644
--- a/GNUmakef.def
+++ b/GNUmakef.def
@@ -57,7 +57,7 @@ LIBEXT=.a
 endif
 endif
 endif
-CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2# -fomit-frame-pointer
+CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DGOLDEDPLUS # -fomit-frame-pointer
 LNKFLAGS+=-g
 CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti
 
diff --git a/goldlib/gmb3/gmoarea.h b/goldlib/gmb3/gmoarea.h
index 61a775f..e1798eb 100644
--- a/goldlib/gmb3/gmoarea.h
+++ b/goldlib/gmb3/gmoarea.h
@@ -87,7 +87,7 @@ public:
         int   originno() const    { return cfg.originno; }
         Attr& attr()              { return cfg.attr; }
         bool  ispacked() const    { return cfg.attr.pkd(); }
-        void  packed(bool a)      { return cfg.attr.pkd(a); }
+        void  packed(bool a)      { cfg.attr.pkd(a); }
 
   bool ascan()          { return (bool)cfg.scan; }
   bool ascanexcl()      { return (bool)cfg.scanexcl; }
diff --git a/goldlib/smblib/Makefile b/goldlib/smblib/Makefile
index 8731166..0146dc1 100644
--- a/goldlib/smblib/Makefile
+++ b/goldlib/smblib/Makefile
@@ -3,7 +3,6 @@
 TOP=../..
 TARGET=smblib
 INCS=-I$(TOP)/goldlib/smblib -I$(TOP)/goldlib/gall
-CFLAGS=-DGOLDEDPLUS
 
 include $(TOP)/GNUmakef.inc
 include $(TOP)/GNUmakef.lib
diff --git a/goldlib/smblib/lzh.h b/goldlib/smblib/lzh.h
index cb919b1..b2ccc18 100644
--- a/goldlib/smblib/lzh.h
+++ b/goldlib/smblib/lzh.h
@@ -58,6 +58,12 @@
 	#define LZHEXPORT
 #endif
 
+#ifdef __GNUC__
+	#ifndef __FLAT__
+		#define __FLAT__
+	#endif
+#endif
+
 #ifndef GOLDEDPLUS
 #ifndef uchar
 #define uchar unsigned char
diff --git a/goldlib/smblib/smblib.cpp b/goldlib/smblib/smblib.cpp
index 44981d1..547a420 100644
--- a/goldlib/smblib/smblib.cpp
+++ b/goldlib/smblib/smblib.cpp
@@ -55,8 +55,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 
 /* SMB-specific headers */
 #include "smblib.h"