diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am
index f8839fb18cde..a63e9eaacceb 100644
--- a/orchagent/Makefile.am
+++ b/orchagent/Makefile.am
@@ -49,39 +49,7 @@ orchagent_SOURCES = \
             vnetorch.cpp \
             dtelorch.cpp \
             flexcounterorch.cpp \
-            watermarkorch.cpp  \
-            acltable.h \
-            aclorch.h \
-            bufferorch.h \
-            copporch.h \
-            directory.h \
-            fdborch.h \
-            intfsorch.h \
-            mirrororch.h \
-            neighorch.h \
-            notifications.h \
-            observer.h \
-            orch.h \
-            orchdaemon.h \
-            pfcactionhandler.h \
-            pfcwdorch.h \
-            port.h \
-            portsorch.h \
-            qosorch.h \
-            routeorch.h \
-            saihelper.h \
-            switchorch.h \
-            swssnet.h \
-            tunneldecaporch.h \
-            crmorch.h        \
-            request_parser.h \
-            vrforch.h \
-            dtelorch.h \
-            countercheckorch.h \
-            vxlanorch.h \
-            vnetorch.h \
-            flexcounterorch.h   \
-            watermarkorch.h
+            watermarkorch.cpp
 
 orchagent_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 orchagent_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)