diff --git a/server/Makefile b/server/Makefile
index e8681c9cd..44b79665d 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -10,13 +10,15 @@ V ?= 2
 
 # Compiler and linker flags
 LDLIBS = -pthread -lrt -lm -lconfig
-CFLAGS  = -std=c99 -Iinclude/ -MMD -Wall
+CFLAGS  = -std=gnu99 -Iinclude/ -MMD -Wall
 CFLAGS += -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -DV=$(V)
 
 # Add git commit hash
 ifneq (,$(shell which git))
 	CFLAGS += -D_GIT_REV='"$(shell git rev-parse --short HEAD)"'
 endif
+
+# Conditional debug flags
 ifdef DEBUG
 	CFLAGS += -O0 -g
 else
@@ -24,13 +26,13 @@ else
 endif
 
 # Enable OPAL-RT Asynchronous Process support
-#OPALDIR = /usr/opalrt/common
-OPALDIR = ../opal
+OPALDIR = /usr/opalrt/common
+#OPALDIR = ../opal
 ifneq (,$(wildcard $(OPALDIR)/include_target/AsyncApi.h))
 	CFLAGS  += -m32 -DENABLE_OPAL_ASYNC -I$(OPALDIR)/include_target
 	LDFLAGS += -m32
 	LDLIBS  += $(addprefix $(OPALDIR)/lib/redhawk/, libOpalAsyncApiCore.a libOpalCore.a libOpalUtils.a libirc.a)
-	COMMON  += opal.o
+	OBJS    += opal.o
 endif
 
 .PHONY: all clean
diff --git a/server/Makefile.mk b/server/Makefile.mk
deleted file mode 100644
index cad32cf05..000000000
--- a/server/Makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-TARGETS = server send random receive test
-
-# Common dependencies for all binaries
-OBJS = socket.o if.o utils.o msg.o node.o cfg.o tc.o hooks.o list.o path.o hist.o
-
-VPATH = src
-
-# Default debug level
-V ?= 2
-
-# Compiler and linker flags
-LDLIBS = -pthread -lrt -lm -lconfig
-CFLAGS  = -std=gnu99 -Iinclude/ -MMD -Wall
-CFLAGS += -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -DV=$(V)
-CFLAGS += -D__GIT_REV__='"-$(shell git rev-parse --short HEAD 2> /dev/null)"'
-
-
-# Conditional flags
-ifdef DEBUG
-	CFLAGS += -O0 -g -D_DEBUG
-else
-	CFLAGS += -O3
-endif
-
-# Enable OPAL-RT Asynchronous Process support
-OPALDIR = /usr/opalrt/common
-ifneq (,$(wildcard $(OPALDIR)/include_target/AsyncApi.h))
-	CFLAGS  += -m32 -DENABLE_OPAL_ASYNC -I$(OPALDIR)/include_target
-	LDFLAGS += -m32
-	LDLIBS  += $(addprefix $(OPALDIR)/lib/redhawk/, libOpalAsyncApiCore.a libOpalCore.a libOpalUtils.a libirc.a)
-	OBJS    += opal.o
-endif
-
-.PHONY: all clean
-
-# Default target: build everything
-all: $(TARGETS)
-	chmod 777 $(TARGETS)
-
-# Dependencies for individual binaries
-server: server.o $(OBJS) 
-send: send.o $(OBJS)
-receive: receive.o $(OBJS)
-random: random.o $(OBJS)
-test: test.o $(OBJS)
-
-clean:
-	$(RM) *~ *.o *.d
-	$(RM) $(TARGETS)
-
-# Include auto-generated dependencies
--include $(wildcard *.d)